samsung: Use common config files with Samsung boards (help wanted)

A few things are common but are not in the common file. Fix this and rename the file to fit with the other exynos*-common files.

Signed-off-by Simon Glass <[email protected]>

---

 include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++-----
 include/configs/peach-pit.h                           |  7 +------
 include/configs/smdk5420.h                            |  7 +------
 3 files changed, 8 insertions(+), 17 deletions(-)
 rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)

include/configs/exynos5420-common.h renamed from include/configs/exynos5420.h +3 -5

similarity index 88%
rename from include/configs/exynos5420.h
rename to include/configs/exynos5420-common.h
index d2a9556..685f9c1 100644
@@ -9,7 +9,9 @@
 #ifndef __CONFIG_EXYNOS5420_H
 #define __CONFIG_EXYNOS5420_H
 
-#define CONFIG_EXYNOS5420		/* which is in a Exynos5 Family */
+#define CONFIG_EXYNOS5420
+
+#include <configs/exynos5-common.h>
 
 #define MACH_TYPE_SMDK5420	8002
 #define CONFIG_MACH_TYPE	MACH_TYPE_SMDK5420

@@ -31,10 +33,6 @@
 
 #define CONFIG_MAX_I2C_NUM	11
 
-/* Enable FIT support and comparison */
-#define CONFIG_FIT
-#define CONFIG_FIT_BEST_MATCH
-
 #define CONFIG_BOARD_REV_GPIO_COUNT	2
 
 #define CONFIG_BOOTCOMMAND	"mmc read 20007000 451 2000; bootm 20007000"

include/configs/exynos5420-common.h renamed from include/configs/exynos5420.h +1 -0

+
 #endif	/* __CONFIG_EXYNOS5420_H */

include/configs/peach-pit.h +1 -6

index 59192e1..407f10f 100644
@@ -9,16 +9,11 @@
 #ifndef __CONFIG_PEACH_PIT_H
 #define __CONFIG_PEACH_PIT_H
 
-#include <configs/exynos5-common.h>
-
-#include <configs/exynos5420.h>
+#include <configs/exynos5420-common.h>
 
 #undef CONFIG_DEFAULT_DEVICE_TREE
 #define CONFIG_DEFAULT_DEVICE_TREE	exynos5420-peach-pit
 
-/* select serial console configuration */
-#define CONFIG_SERIAL3		/* use SERIAL 3 */
-
 #define CONFIG_SYS_PROMPT	"Peach # "
 #define CONFIG_IDENT_STRING	" for Peach"
 

include/configs/smdk5420.h +1 -3

index 43c9808..83abc13 100644
@@ -9,18 +9,13 @@
 #ifndef __CONFIG_SMDK5420_H
 #define __CONFIG_SMDK5420_H
 
-#include <configs/exynos5-common.h>
-
-#include <configs/exynos5420.h>
+#include <configs/exynos5420-common.h>
 
 #define CONFIG_SMDK5420			/* which is in a SMDK5420 */

Dear Simon Glass,

Quoted 45 lines · Simon Glass

A few things are common but are not in the common file. Fix this and rename the file to fit with the other exynos*-common files.

Signed-off-by Simon Glass <[email protected]>

---

 include/configs/{exynos5420.h => exynos5420-common.h} | 11 ++++++-----
 include/configs/peach-pit.h                           |  7 +------
 include/configs/smdk5420.h                            |  7 +------
 3 files changed, 8 insertions(+), 17 deletions(-)
 rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)

include/configs/exynos5420-common.h renamed from include/configs/exynos5420.h +3 -5

similarity index 88%
rename from include/configs/exynos5420.h
rename to include/configs/exynos5420-common.h
index d2a9556..685f9c1 100644
@@ -9,7 +9,9 @@
 #ifndef __CONFIG_EXYNOS5420_H
 #define __CONFIG_EXYNOS5420_H
 
-#define CONFIG_EXYNOS5420            /* which is in a Exynos5 Family */
+#define CONFIG_EXYNOS5420
+
+#include <configs/exynos5-common.h>
 
 #define MACH_TYPE_SMDK5420   8002
 #define CONFIG_MACH_TYPE     MACH_TYPE_SMDK5420

@@ -31,10 +33,6 @@
 
 #define CONFIG_MAX_I2C_NUM   11
 
-/* Enable FIT support and comparison */
-#define CONFIG_FIT
-#define CONFIG_FIT_BEST_MATCH
-
 #define CONFIG_BOARD_REV_GPIO_COUNT  2
 
 #define CONFIG_BOOTCOMMAND   "mmc read 20007000 451 2000; bootm 20007000"

@@ -49,4 +47,7 @@
 #define CONFIG_NR_DRAM_BANKS 7
 #define SDRAM_BANK_SIZE              (512UL << 20UL) /* 512 MB */
 

include/configs/exynos5420-common.h line 51

Quoted 2 lines

include/configs/exynos5420-common.h renamed from include/configs/exynos5420.h +2 -0

+/* select serial console configuration */
+#define CONFIG_SERIAL3               /* use SERIAL 3 */

I think it's a board specific feature.

Most of the arndale features are common with other exynos5250 boards. To permit easier addition of driver model support, use the common file.

Signed-off-by Simon Glass <[email protected]>

---

 include/configs/arndale.h | 212 +++-------------------------------------------
 1 file changed, 14 insertions(+), 198 deletions(-)

include/configs/arndale.h +14 -189

index 370db82..1f0bec9 100644
@@ -9,219 +9,55 @@
 #ifndef __CONFIG_ARNDALE_H
 #define __CONFIG_ARNDALE_H
 
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG			/* in a SAMSUNG core */
-#define CONFIG_S5P			/* S5P Family */
-#define CONFIG_EXYNOS5			/* which is in a Exynos5 Family */
-#define CONFIG_EXYNOS5250
-
-#include <asm/arch/cpu.h>		/* get chip and board defs */
-
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
-/* Allow tracing to be enabled */
-#define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
-#define CONFIG_TRACE_BUFFER_SIZE	(16 << 20)
-#define CONFIG_TRACE_EARLY_SIZE		(8 << 20)
-#define CONFIG_TRACE_EARLY
-#define CONFIG_TRACE_EARLY_ADDR		0x50000000
-
-/* Keep L2 Cache Disabled */
-#define CONFIG_SYS_DCACHE_OFF
-
-#define CONFIG_SYS_SDRAM_BASE		0x40000000
-#define CONFIG_SYS_TEXT_BASE		0x43E00000
-
-/* input clock of PLL: SMDK5250 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ		24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/* Power Down Modes */
-#define S5P_CHECK_SLEEP			0x00000BAD
-#define S5P_CHECK_DIDLE			0xBAD00000
-#define S5P_CHECK_LPA			0xABAD0000
-
-/* Offset for inform registers */
-#define INFORM0_OFFSET			0x800
-#define INFORM1_OFFSET			0x804
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (4 << 20))
-
-/* select serial console configuration */
-#define CONFIG_BAUDRATE			115200
-#define EXYNOS5_DEFAULT_UART_OFFSET	0x010000
-#define CONFIG_SILENT_CONSOLE
-
-/* Console configuration */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define EXYNOS_DEVICE_SETTINGS \
-		"stdin=serial\0" \
-		"stdout=serial\0" \
-		"stderr=serial\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	EXYNOS_DEVICE_SETTINGS
+#include "exynos5250-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-#define CONFIG_DWMMC
-#define CONFIG_EXYNOS_DWMMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
-
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* PWM */
-#define CONFIG_PWM
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-/* Command definition*/
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_HASH
-
-#define CONFIG_BOOTDELAY		3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* USB */
-#define CONFIG_CMD_USB
+#undef CONFIG_USB_XHCI
+#undef CONFIG_USB_XHCI_EXYNOS
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
-#define CONFIG_USB_STORAGE
 
+#undef CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL
-#define COPY_BL2_FNPTR_ADDR	0x02020030
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-
-/* specific .lds file */
-#define CONFIG_SPL_LDSCRIPT	"board/samsung/common/exynos-uboot-spl.lds"
-#define CONFIG_SPL_TEXT_BASE	0x02023400
-#define CONFIG_SPL_MAX_FOOTPRINT	(14 * 1024)
-
-#define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
+#undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT		"ARNDALE # "
-#define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE		384	/* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS		16	/* max number of command args */
+#undef CONFIG_DEFAULT_CONSOLE
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x5E00000)
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
-#define CONFIG_RD_LVL
 
 #define CONFIG_NR_DRAM_BANKS	8
 #define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256 MB */
-#define PHYS_SDRAM_1		CONFIG_SYS_SDRAM_BASE
-#define PHYS_SDRAM_1_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2		(CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
-#define PHYS_SDRAM_2_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3		(CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_3_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4		(CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_4_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5		(CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_5_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6		(CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_6_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7		(CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_7_SIZE	SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8		(CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_8_SIZE	SDRAM_BANK_SIZE
-
-#define CONFIG_SYS_MONITOR_BASE	0x00000000
-
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING		" for ARNDALE"
 
-#define CONFIG_SYS_MMC_ENV_DEV		0
+#undef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING		" for ARNDALE"
 
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SECURE_BL1_ONLY
-
-/* Secure FW size configuration */
-#ifdef	CONFIG_SECURE_BL1_ONLY
-#define	CONFIG_SEC_FW_SIZE		(8 << 10)	/* 8KB */
-#else
-#define	CONFIG_SEC_FW_SIZE		0
-#endif
-
-/* Configuration of BL1, BL2, ENV Blocks on mmc */
-#define CONFIG_RES_BLOCK_SIZE	(512)
-#define CONFIG_BL1_SIZE		(16 << 10) /*16 K reserved for BL1*/
-#define	CONFIG_BL2_SIZE		(512UL << 10UL)	/* 512 KB */
-#define CONFIG_ENV_SIZE		(16 << 10)	/* 16 KB */
-
-#define CONFIG_BL1_OFFSET	(CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
-#define CONFIG_BL2_OFFSET	(CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
-#define CONFIG_ENV_OFFSET	(CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
-
-/* U-boot copy size from boot Media to DRAM.*/
-#define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
-#define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
 
+#undef CONFIG_ENV_OFFSET
+#define CONFIG_ENV_OFFSET	(CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
 
 #define CONFIG_IRAM_STACK	0x02050000
 
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK
 
-/* I2C */
-#define CONFIG_SYS_I2C_INIT_BOARD
-#define CONFIG_SYS_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_S3C24X0_SPEED	100000		/* 100 Kbps */
-#define CONFIG_SYS_I2C_S3C24X0
-#define CONFIG_MAX_I2C_NUM	8
-#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
-#define CONFIG_I2C_EDID
-
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C

@@ -231,24 +67,4 @@
 
 #define CONFIG_PREBOOT
 
-/* Ethernet Controllor Driver */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_BASE		0x5000000
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_ENV_SROM_BANK		1
-#endif /*CONFIG_CMD_NET*/
-
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE

Dear Simon Glass,

Quoted 268 lines · Simon Glass

Most of the arndale features are common with other exynos5250 boards. To permit easier addition of driver model support, use the common file.

Signed-off-by Simon Glass <[email protected]>

---

 include/configs/arndale.h | 212 +++-------------------------------------------
 1 file changed, 14 insertions(+), 198 deletions(-)

include/configs/arndale.h +14 -195

index 370db82..1f0bec9 100644
@@ -9,219 +9,55 @@
 #ifndef __CONFIG_ARNDALE_H
 #define __CONFIG_ARNDALE_H
 
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG                       /* in a SAMSUNG core */
-#define CONFIG_S5P                   /* S5P Family */
-#define CONFIG_EXYNOS5                       /* which is in a Exynos5 Family */
-#define CONFIG_EXYNOS5250
-
-#include <asm/arch/cpu.h>            /* get chip and board defs */
-
-#define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
-
-/* Allow tracing to be enabled */
-#define CONFIG_TRACE
-#define CONFIG_CMD_TRACE
-#define CONFIG_TRACE_BUFFER_SIZE     (16 << 20)
-#define CONFIG_TRACE_EARLY_SIZE              (8 << 20)
-#define CONFIG_TRACE_EARLY
-#define CONFIG_TRACE_EARLY_ADDR              0x50000000
-
-/* Keep L2 Cache Disabled */
-#define CONFIG_SYS_DCACHE_OFF
-
-#define CONFIG_SYS_SDRAM_BASE                0x40000000
-#define CONFIG_SYS_TEXT_BASE         0x43E00000
-
-/* input clock of PLL: SMDK5250 has 24MHz input clock */
-#define CONFIG_SYS_CLK_FREQ          24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/* Power Down Modes */
-#define S5P_CHECK_SLEEP                      0x00000BAD
-#define S5P_CHECK_DIDLE                      0xBAD00000
-#define S5P_CHECK_LPA                        0xABAD0000
-
-/* Offset for inform registers */
-#define INFORM0_OFFSET                       0x800
-#define INFORM1_OFFSET                       0x804
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN                (CONFIG_ENV_SIZE + (4 << 20))
-
-/* select serial console configuration */
-#define CONFIG_BAUDRATE                      115200
-#define EXYNOS5_DEFAULT_UART_OFFSET  0x010000
-#define CONFIG_SILENT_CONSOLE
-
-/* Console configuration */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define EXYNOS_DEVICE_SETTINGS \
-             "stdin=serial\0" \
-             "stdout=serial\0" \
-             "stderr=serial\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-     EXYNOS_DEVICE_SETTINGS
+#include "exynos5250-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_SDHCI
-#define CONFIG_S5P_SDHCI
-#define CONFIG_DWMMC
-#define CONFIG_EXYNOS_DWMMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_BOUNCE_BUFFER
-
-
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/* PWM */
-#define CONFIG_PWM
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-/* Command definition*/
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_MMC
 #define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_HASH
-
-#define CONFIG_BOOTDELAY             3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 /* USB */
-#define CONFIG_CMD_USB
+#undef CONFIG_USB_XHCI
+#undef CONFIG_USB_XHCI_EXYNOS
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
-#define CONFIG_USB_STORAGE
 
+#undef CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS   3
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL
-#define COPY_BL2_FNPTR_ADDR  0x02020030
-
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-
-/* specific .lds file */
-#define CONFIG_SPL_LDSCRIPT  "board/samsung/common/exynos-uboot-spl.lds"
-#define CONFIG_SPL_TEXT_BASE 0x02023400
-#define CONFIG_SPL_MAX_FOOTPRINT     (14 * 1024)
-
-#define CONFIG_BOOTCOMMAND   "mmc read 40007000 451 2000; bootm 40007000"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP          /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER               /* use "hush" command parser    */
+#undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT            "ARNDALE # "
-#define CONFIG_SYS_CBSIZE            256     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE            384     /* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS           16      /* max number of command args */
+#undef CONFIG_DEFAULT_CONSOLE
 #define CONFIG_DEFAULT_CONSOLE               "console=ttySAC2,115200n8\0"
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE          CONFIG_SYS_CBSIZE
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START     CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END               (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
-#define CONFIG_SYS_LOAD_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
-
-#define CONFIG_RD_LVL
 
 #define CONFIG_NR_DRAM_BANKS 8
 #define SDRAM_BANK_SIZE              (256UL << 20UL) /* 256 MB */
-#define PHYS_SDRAM_1         CONFIG_SYS_SDRAM_BASE
-#define PHYS_SDRAM_1_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_2         (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
-#define PHYS_SDRAM_2_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_3         (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_3_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_4         (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_4_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_5         (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_5_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_6         (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_6_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_7         (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_7_SIZE    SDRAM_BANK_SIZE
-#define PHYS_SDRAM_8         (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
-#define PHYS_SDRAM_8_SIZE    SDRAM_BANK_SIZE
-
-#define CONFIG_SYS_MONITOR_BASE      0x00000000
-
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
-#define CONFIG_IDENT_STRING          " for ARNDALE"
 
-#define CONFIG_SYS_MMC_ENV_DEV               0
+#undef CONFIG_IDENT_STRING
+#define CONFIG_IDENT_STRING          " for ARNDALE"
 
+#undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SECURE_BL1_ONLY
-
-/* Secure FW size configuration */
-#ifdef       CONFIG_SECURE_BL1_ONLY
-#define      CONFIG_SEC_FW_SIZE              (8 << 10)       /* 8KB */
-#else
-#define      CONFIG_SEC_FW_SIZE              0
-#endif
-
-/* Configuration of BL1, BL2, ENV Blocks on mmc */
-#define CONFIG_RES_BLOCK_SIZE        (512)
-#define CONFIG_BL1_SIZE              (16 << 10) /*16 K reserved for BL1*/
-#define      CONFIG_BL2_SIZE         (512UL << 10UL) /* 512 KB */
-#define CONFIG_ENV_SIZE              (16 << 10)      /* 16 KB */
-
-#define CONFIG_BL1_OFFSET    (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
-#define CONFIG_BL2_OFFSET    (CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
-#define CONFIG_ENV_OFFSET    (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
-
-/* U-boot copy size from boot Media to DRAM.*/
-#define BL2_START_OFFSET     (CONFIG_BL2_OFFSET/512)
-#define BL2_SIZE_BLOC_COUNT  (CONFIG_BL2_SIZE/512)
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_PART
-#define CONFIG_PARTITION_UUIDS
 
+#undef CONFIG_ENV_OFFSET
+#define CONFIG_ENV_OFFSET    (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
 
 #define CONFIG_IRAM_STACK    0x02050000
 
 #define CONFIG_SYS_INIT_SP_ADDR      CONFIG_IRAM_STACK
 
-/* I2C */
-#define CONFIG_SYS_I2C_INIT_BOARD
-#define CONFIG_SYS_I2C
-#define CONFIG_CMD_I2C
-#define CONFIG_SYS_I2C_S3C24X0_SPEED 100000          /* 100 Kbps */
-#define CONFIG_SYS_I2C_S3C24X0
-#define CONFIG_MAX_I2C_NUM   8
-#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0
-#define CONFIG_I2C_EDID
-
 /* PMIC */
 #define CONFIG_PMIC
 #define CONFIG_POWER_I2C

@@ -231,24 +67,4 @@
 
 #define CONFIG_PREBOOT
 
-/* Ethernet Controllor Driver */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_BASE          0x5000000
-#define CONFIG_SMC911X_16_BIT
-#define CONFIG_ENV_SROM_BANK         1
-#endif /*CONFIG_CMD_NET*/
-
-/* Enable PXE Support */
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
-#endif
-
-/* Enable devicetree support */
-#define CONFIG_OF_LIBFDT
-

include/configs/arndale.h line 70

Quoted 5 lines

include/configs/arndale.h +0 -3

-/* Enable Time Command */
-#define CONFIG_CMD_TIME
-
 #endif       /* __CONFIG_H */

Features those are you did undef at this file are not common features. I think we should need to rearrange features.

Change this board to use the exynos common config and add a device tree.

This also adds a pinmux header file - but it is just a copy of the exynos one so may be incorrect.

Signed-off-by Simon Glass <[email protected]>

---

  arch/arm/dts/Makefile                      |  1 +
  arch/arm/dts/s5pc1xx-goni.dts              | 21 ++++++++++
  arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++++++++++++++++++++++++++
  arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 ++++++++++++++++++++++++
  drivers/mmc/s5p_sdhci.c                    |  2 -
  include/configs/s5p_goni.h                 | 55 +++++----------------------
  6 files changed, 143 insertions(+), 47 deletions(-)

create mode 100644 arch/arm/dts/s5pc1xx-goni.dts create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h

arch/arm/dts/Makefile +1 -0

index 3b760ff..6a6e664 100644
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
  dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
  	exynos4210-smdkv310.dtb \
  	exynos4210-universal_c210.dtb \

arch/arm/dts/s5pc1xx-goni.dts new file +0 -0

new file mode 100644
index 0000000..c390c8f

Hello Simon,

Quoted 46 lines · Simon Glass

Change this board to use the exynos common config and add a device tree.

This also adds a pinmux header file - but it is just a copy of the exynos one so may be incorrect.

Signed-off-by Simon Glass <[email protected]>

---

  arch/arm/dts/Makefile                      |  1 +
  arch/arm/dts/s5pc1xx-goni.dts              | 21 ++++++++++
  arch/arm/include/asm/arch-s5pc1xx/periph.h | 61
++++++++++++++++++++++++++++++
  arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50
++++++++++++++++++++++++
  drivers/mmc/s5p_sdhci.c                    |  2 -
  include/configs/s5p_goni.h                 | 55
+++++----------------------
  6 files changed, 143 insertions(+), 47 deletions(-)

create mode 100644 arch/arm/dts/s5pc1xx-goni.dts create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h

arch/arm/dts/Makefile +1 -0

index 3b760ff..6a6e664 100644
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
  dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
        exynos4210-universal_c210.dtb \

arch/arm/dts/s5pc1xx-goni. renamed from arch/arm/dts/s5pc1xx-goni.dts +0 -0

dts
new file mode 100644
index 0000000..c390c8f

arch/arm/dts/s5pc1xx-goni.dts new file +8 -0

@@ -0,0 +1,21 @@
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+

arch/arm/dts/s5pc1xx-goni.dts line 9

Quoted 2 lines

arch/arm/dts/s5pc1xx-goni.dts new file +1 -0

+/dts-v1/;

This is a mistake. Exynos4 is different than s5pc1xx(which was later called exynos3 and is also called s5pv210(kernel)).
So the s5pc1xx-goni.dts should include:
model = "Samsung Goni based on S5PC110";
compatible = "samsung,goni", "samsung,s5pc110";

And the base addresses are different than exynos4. Please look at:
arch/arm/include/asm/arch-s5pc1xx/cpu.h

This will require also a common file for s5pc1xx: s5pc1xx-common.dts. Moreover, the S5PC100 and S5PC110 have lot of differences.

Simon, I think that this is a job for goni's maintainer, since you can't test it on a hardware.

Robert, can you look at this?

+/include/ "exynos4.dtsi"

arch/arm/dts/s5pc1xx-goni.dts line 21

Quoted 12 lines

arch/arm/dts/s5pc1xx-goni.dts new file +11 -0

+
+/ {
+       model = "Samsung SMDKV310 on Exynos4210";
+       compatible = "samsung,smdkv310", "samsung,exynos4210";
+
+       aliases {
+               serial0 = "/serial at 13800000";
+               console = "/serial at 13820000";
+       };
+
+};

Best regards,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Change this board to use the exynos common config and add a device tree.

Signed-off-by Simon Glass <[email protected]>

---

  arch/arm/dts/Makefile             |  1 +
  arch/arm/dts/s5pc1xx-smdkc100.dts | 21 +++++++++++++++
  include/configs/smdkc100.h        | 57 +++++++++------------------------------
  3 files changed, 35 insertions(+), 44 deletions(-)

create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts

arch/arm/dts/Makefile +1 -0

index 6a6e664..ed67844 100644
@@ -1,3 +1,4 @@
+dtb-$(CONFIG_S5PC100) += s5pc1xx-smdkc100.dtb
  dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb
  dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \
  	exynos4210-smdkv310.dtb \

arch/arm/dts/s5pc1xx-smdkc100.dts new file +0 -0

new file mode 100644
index 0000000..409812d

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

Simon Glass (8):
exynos: Rename -dt config files to -common
exynos: Move common exynos settings into a common file
exynos: Move common smdk5420 things to common file
exynos: config: Move cros_ec and tps65090 out of smdk boards
config: Move arndale to use common exynos5250 file
config: Move smdkv310 to use common exynos4 file
samsung: Move s5p_goni to use exynos-common config
samsung: Move smdkc100 to use exynos-common config

 arch/arm/dts/Makefile                              |   3 +
 arch/arm/dts/exynos4210-smdkv310.dts               |  21 ++
 arch/arm/dts/s5pc1xx-goni.dts                      |  21 ++
 arch/arm/dts/s5pc1xx-smdkc100.dts                  |  21 ++
 arch/arm/include/asm/arch-s5pc1xx/periph.h         |  61 ++++++
 arch/arm/include/asm/arch-s5pc1xx/pinmux.h         |  50 +++++
 drivers/mmc/s5p_sdhci.c                            |   2 -
 include/configs/arndale.h                          | 212
++------------------- include/configs/{exynos4-dt.h =>
exynos-common.h}  | 104 +++-------
include/configs/exynos4-common.h                   |  64 +++++++
include/configs/{exynos5-dt.h => exynos5-common.h} | 110 ++---------
include/configs/exynos5-dt-common.h                |  35
++++ .../{exynos5250-dt.h => exynos5250-common.h}       |   5
+- .../configs/{exynos5420.h => exynos5420-common.h}  |  11 +-
include/configs/origen.h                           |   5 +-
include/configs/peach-pit.h                        |   8 +-
include/configs/s5p_goni.h                         |  55 +-----
include/configs/s5pc210_universal.h                |   5 +-
include/configs/smdk5250.h                         |   6 +-
include/configs/smdk5420.h                         |   7 +-
include/configs/smdkc100.h                         |  57 ++----
include/configs/smdkv310.h                         |  65 ++-----
include/configs/snow.h                             |   8 +-
include/configs/trats.h                            |   6 +-
include/configs/trats2.h                           |   6 +- 25 files

changed, 390 insertions(+), 558 deletions(-) create mode 100644 arch/arm/dts/exynos4210-smdkv310.dts create mode 100644 arch/arm/dts/s5pc1xx-goni.dts create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h rename include/configs/{exynos4-dt.h => exynos-common.h} (54%) create mode 100644 include/configs/exynos4-common.h rename include/configs/{exynos5-dt.h => exynos5-common.h} (70%) create mode 100644 include/configs/exynos5-dt-common.h rename include/configs/{exynos5250-dt.h => exynos5250-common.h} (92%) rename include/configs/{exynos5420.h => exynos5420-common.h} (88%)

Hi Simon,

Quoted 21 lines

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

Quoted 2 lines

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

We will do our best to test our Exynos4 based boards.

Hi Lucasz,

Quoted 23 lines · Lukasz Majewski

Hi Simon,

Quoted 21 lines

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

Quoted 4 lines

Quoted 2 lines

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

We will do our best to test our Exynos4 based boards.

Thanks - please feel free to re-issue the patches and I will drop mine (if you cc me).

Hi Minkyu,

Quoted 26 lines · Simon Glass

Hi Lucasz,

Quoted 23 lines · Lukasz Majewski

Hi Simon,

Quoted 21 lines

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

Quoted 8 lines

Quoted 4 lines

Quoted 2 lines

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

We will do our best to test our Exynos4 based boards.

Thanks - please feel free to re-issue the patches and I will drop mine (if you cc me).

Can you please review this series? We are already at rc2.

Regards,
Simon

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Hi,

I will test this patch set on a trats2 board - today evening.

Quoted 46 lines · Simon Glass

Hi Minkyu,

Quoted 26 lines · Simon Glass

Hi Lucasz,

Quoted 23 lines · Lukasz Majewski

Hi Simon,

Quoted 21 lines

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

Quoted 8 lines

Quoted 4 lines

Quoted 2 lines

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

We will do our best to test our Exynos4 based boards.

Thanks - please feel free to re-issue the patches and I will drop mine (if you cc me).

Can you please review this series? We are already at rc2.

Regards,
Simon

Quoted 5 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Best regards,

Hello Simon,

Quoted 62 lines · Przemyslaw Marczak

Hi,

I will test this patch set on a trats2 board - today evening.

Quoted 55 lines · Simon Glass

Hi Minkyu,

Quoted 31 lines · Simon Glass

Hi Lucasz,

Quoted 28 lines · Lukasz Majewski

Hi Simon,

Quoted 23 lines

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos5.

The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful.

Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back.

There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these with the most rudimentary of device tree files.

Unfortunately I don't have boards for most of these (for testing) and I am hoping that the maintainers can come to the rescue and fix up any patches that have problems. I am also worried that I have used a common exynos file for things like smdkv310, when in fact they have some other chip in common.

So maintainers, please can you test this and re-issue the patch, or make comments on my attempts?

Quoted 6 lines

Quoted 1 line

We will do our best to test our Exynos4 based boards.

Thanks - please feel free to re-issue the patches and I will drop mine (if you cc me).

Can you please review this series? We are already at rc2.

Regards,
Simon

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Quoted 1 line

Best regards,

It works fine on trats2.
I'm currently working on PMIC framework at the top of your u-boot-dm/working branch and it also works fine on Trats2.