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

Tom Rini
2 parents 87de0eb31c 18c9b10ce7
Showing 3 changed files Side-by-side Diff
board/sysam/amcore/amcore.c
configs/amcore_defconfig
include/configs/amcore.h
 /*
  * 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,4 +101,15 @@
  
 	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,
+};
@@ -3,6 +3,10 @@
 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
 /*
  * 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
1	1	/*
2	2	* Board functions for Sysam AMCORE (MCF5307 based) board
3	3	*
4		- * (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it>
	4	+ * (C) Copyright 2016 Angelo Dureghello <angelo@sysam.it>
5	5	*
6	6	* SPDX-License-Identifier: GPL-2.0+
7	7	*
...	...	@@ -11,6 +11,8 @@
11	11	#include <common.h>
12	12	#include <asm/immap.h>
13	13	#include <asm/io.h>
	14	+#include <dm.h>
	15	+#include <dm/platform_data/serial_coldfire.h>
14	16
15	17	void init_lcd(void)
16	18	{
...	...	@@ -99,4 +101,15 @@
99	101
100	102	return get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE);
101	103	}
	104	+
	105	+static struct coldfire_serial_platdata mcf5307_serial_plat = {
	106	+ .base = CONFIG_SYS_UART_BASE,
	107	+ .port = 0,
	108	+ .baudrate = CONFIG_BAUDRATE,
	109	+};
	110	+
	111	+U_BOOT_DEVICE(coldfire_serial) = {
	112	+ .name = "serial_coldfire",
	113	+ .platdata = &mcf5307_serial_plat,
	114	+};
...	...	@@ -3,6 +3,10 @@
3	3	CONFIG_SYS_TEXT_BASE=0xffc00000
4	4	CONFIG_BOOTDELAY=1
5	5	CONFIG_SYS_PROMPT="amcore $ "
	6	+CONFIG_DM=y
	7	+CONFIG_DM_SERIAL=y
	8	+CONFIG_SYS_MALLOC_F=y
	9	+CONFIG_SYS_MALLOC_F_LEN=0x800
6	10	# CONFIG_CMD_BOOTD is not set
7	11	# CONFIG_CMD_XIMG is not set
8	12	CONFIG_LOOPW=y
1	1	/*
2	2	* Sysam AMCORE board configuration
3	3	*
4		- * (C) Copyright 2015 Angelo Dureghello <angelo@sysam.it>
	4	+ * (C) Copyright 2016 Angelo Dureghello <angelo@sysam.it>
5	5	*
6	6	* SPDX-License-Identifier: GPL-2.0+
7	7	*/
...	...	@@ -19,6 +19,17 @@
19	19	#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
20	20
21	21	#define CONFIG_BOOTCOMMAND "bootm ffc20000"
	22	+#define CONFIG_EXTRA_ENV_SETTINGS \
	23	+ "upgrade_uboot=loady; " \
	24	+ "protect off 0xffc00000 0xffc1ffff; " \
	25	+ "erase 0xffc00000 0xffc1ffff; " \
	26	+ "cp.b 0x20000 0xffc00000 ${filesize}\0" \
	27	+ "upgrade_kernel=loady; " \
	28	+ "erase 0xffc20000 0xffefffff; " \
	29	+ "cp.b 0x20000 0xffc20000 ${filesize}\0" \
	30	+ "upgrade_jffs2=loady; " \
	31	+ "erase 0xfff00000 0xffffffff; " \
	32	+ "cp.b 0x20000 0xfff00000 ${filesize}\0"
22	33
23	34	#undef CONFIG_CMD_AES
24	35	#define CONFIG_CMD_DIAG