V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-coldfire

This commit is contained in:
Tom Rini 2016-09-26 09:31:01 -04:00
parent 87de0eb31c 18c9b10ce7
commit 37cc644600
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
board/sysam/amcore/amcore.c
View File

@ -1,7 +1,7 @@
/* /*
* Board functions for Sysam AMCORE (MCF5307 based) board * Board functions for Sysam AMCORE (MCF5307 based) board
* *
* (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it> * (C) Copyright 2016 Angelo Dureghello <angelo@sysam.it>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
* *
@ -11,6 +11,8 @@
#include <common.h> #include <common.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm.h>
#include <dm/platform_data/serial_coldfire.h>
void init_lcd(void) void init_lcd(void)
{ {
@ -99,3 +101,14 @@ phys_size_t initdram(int board_type)
return get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE); return get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE);
} }
static struct coldfire_serial_platdata mcf5307_serial_plat = {
.base = CONFIG_SYS_UART_BASE,
.port = 0,
.baudrate = CONFIG_BAUDRATE,
};
U_BOOT_DEVICE(coldfire_serial) = {
.name = "serial_coldfire",
.platdata = &mcf5307_serial_plat,
};

4
configs/amcore_defconfig
View File

@ -3,6 +3,10 @@ CONFIG_TARGET_AMCORE=y
CONFIG_SYS_TEXT_BASE=0xffc00000 CONFIG_SYS_TEXT_BASE=0xffc00000
CONFIG_BOOTDELAY=1 CONFIG_BOOTDELAY=1
CONFIG_SYS_PROMPT="amcore $ " CONFIG_SYS_PROMPT="amcore $ "
CONFIG_DM=y
CONFIG_DM_SERIAL=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x800
# CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTD is not set
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set
CONFIG_LOOPW=y CONFIG_LOOPW=y

13
include/configs/amcore.h
View File

@ -1,7 +1,7 @@
/* /*
* Sysam AMCORE board configuration * Sysam AMCORE board configuration
* *
* (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it> * (C) Copyright 2016 Angelo Dureghello <angelo@sysam.it>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -19,6 +19,17 @@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#define CONFIG_BOOTCOMMAND "bootm ffc20000" #define CONFIG_BOOTCOMMAND "bootm ffc20000"
#define CONFIG_EXTRA_ENV_SETTINGS \
"upgrade_uboot=loady; " \
"protect off 0xffc00000 0xffc1ffff; " \
"erase 0xffc00000 0xffc1ffff; " \
"cp.b 0x20000 0xffc00000 ${filesize}\0" \
"upgrade_kernel=loady; " \
"erase 0xffc20000 0xffefffff; " \
"cp.b 0x20000 0xffc20000 ${filesize}\0" \
"upgrade_jffs2=loady; " \
"erase 0xfff00000 0xffffffff; " \
"cp.b 0x20000 0xfff00000 ${filesize}\0"
#undef CONFIG_CMD_AES #undef CONFIG_CMD_AES
#define CONFIG_CMD_DIAG #define CONFIG_CMD_DIAG