diff options
| author | Tom Rini <trini@konsulko.com> | 2016-09-26 09:31:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-26 09:31:01 -0400 |
| commit | 37cc64460081df4b824e4fc13526c53ea3846f87 (patch) | |
| tree | 89c5ffc3ab87a17a9eaca3e18325e3cc25835f31 | |
| parent | 87de0eb31ca86a7a675c000f48f5f24bf92b872d (diff) | |
| parent | 18c9b10ce76ea0f99e6c68ce6ab75c373eedb4c4 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
| -rw-r--r-- | board/sysam/amcore/amcore.c | 15 | ||||
| -rw-r--r-- | configs/amcore_defconfig | 4 | ||||
| -rw-r--r-- | include/configs/amcore.h | 13 |
3 files changed, 30 insertions, 2 deletions
diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 42b7c23f06..b7217c56ec 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -1,7 +1,7 @@ /* * 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+ * @@ -11,6 +11,8 @@ #include <common.h> #include <asm/immap.h> #include <asm/io.h> +#include <dm.h> +#include <dm/platform_data/serial_coldfire.h> 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); } + +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, +}; diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index 0361418d90..5cc512ce7a 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -3,6 +3,10 @@ CONFIG_TARGET_AMCORE=y CONFIG_SYS_TEXT_BASE=0xffc00000 CONFIG_BOOTDELAY=1 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_XIMG is not set CONFIG_LOOPW=y diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 5667680230..fcb82e286c 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -1,7 +1,7 @@ /* * 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+ */ @@ -19,6 +19,17 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #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 #define CONFIG_CMD_DIAG |