diff mbox

[U-Boot,8/8] samsung: Move smdkc100 to use exynos-common config

Message ID 1406117482-2391-9-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Minkyu Kang
Headers show

Commit Message

Simon Glass July 23, 2014, 12:11 p.m. UTC 
Change this board to use the exynos common config and add a device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 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

Comments

Przemyslaw Marczak Sept. 9, 2014, 10:26 a.m. UTC | #1 
Hello Simon,

On 07/23/2014 02:11 PM, Simon Glass wrote:
> Change this board to use the exynos common config and add a device tree.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   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
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 6a6e664..ed67844 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -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 \
> diff --git a/arch/arm/dts/s5pc1xx-smdkc100.dts b/arch/arm/dts/s5pc1xx-smdkc100.dts
> new file mode 100644
> index 0000000..409812d
> --- /dev/null
> +++ b/arch/arm/dts/s5pc1xx-smdkc100.dts
> @@ -0,0 +1,21 @@
> +/*
> + * Samsung's Exynos4210-based SMDKV310 board device tree source
> + *
> + * Copyright (c) 2014 Google, Inc
> + *
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +/dts-v1/;

The same as in s5pc110:
> +/include/ "exynos4.dtsi"
> +
> +/ {
> +	model = "Samsung SMDKC100";
> +	compatible = "samsung,smdkc100";
> +
> +	aliases {
Bad base addresses:
> +		serial0 = "/serial@13800000";
> +		console = "/serial@13820000";
> +	};
> +

Best regards,
diff mbox

Patch

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 6a6e664..ed67844 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -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 \
diff --git a/arch/arm/dts/s5pc1xx-smdkc100.dts b/arch/arm/dts/s5pc1xx-smdkc100.dts
new file mode 100644
index 0000000..409812d
--- /dev/null
+++ b/arch/arm/dts/s5pc1xx-smdkc100.dts
@@ -0,0 +1,21 @@ 
+/*
+ * Samsung's Exynos4210-based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+	model = "Samsung SMDKC100";
+	compatible = "samsung,smdkc100";
+
+	aliases {
+		serial0 = "/serial@13800000";
+		console = "/serial@13820000";
+	};
+
+};
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index c9a2e15..4fd288c 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -12,73 +12,51 @@ 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include "exynos-common.h"
+
+#undef CONFIG_BOARD_COMMON
+#undef CONFIG_ARCH_EARLY_INIT_R
+#undef CONFIG_BOARD_EARLY_INIT_F
+#undef CONFIG_GENERIC_MMC
+#undef CONFIG_CMD_MMC
+#undef CONFIG_MMC
+#undef CONFIG_S5P_SDHCI
+#undef CONFIG_EXYNOS_DWMMC
+
 /*
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_SAMSUNG		1	/* in a SAMSUNG core */
-#define CONFIG_S5P		1	/* which is in a S5P Family */
 #define CONFIG_S5PC100		1	/* which is in a S5PC100 */
 #define CONFIG_SMDKC100		1	/* working with SMDKC100 */
 
-#include <asm/arch/cpu.h>		/* get chip and board defs */
-
-#define CONFIG_ARCH_CPU_INIT
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-/* input clock of PLL: SMDKC100 has 12MHz input clock */
-#define CONFIG_SYS_CLK_FREQ		12000000
-
 /* DRAM Base */
 #define CONFIG_SYS_SDRAM_BASE		0x30000000
 
 /* Text Base */
 #define CONFIG_SYS_TEXT_BASE		0x34800000
 
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_EDITING
-
-/*
- * Size of malloc() pool
- * 1MB = 0x100000, 0x100000 = 1024 * 1024
- */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (1 << 20))
 /*
  * select serial console configuration
  */
 #define CONFIG_SERIAL0			1	/* use SERIAL 0 on SMDKC100 */
 
-/* PWM */
-#define CONFIG_PWM			1
-
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE			115200
 
 /***********************************************************
  * Command definition
  ***********************************************************/
-#include <config_cmd_default.h>
 
 #undef CONFIG_CMD_FLASH
 #undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_NAND
 
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_ONENAND
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_MTDPARTS
 
-#define CONFIG_BOOTDELAY	3
-
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
@@ -153,14 +131,7 @@ 
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP		/* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
 #define CONFIG_SYS_PROMPT		"SMDKC100 # "
-#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 */
-/* 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)
@@ -176,8 +147,6 @@ 
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
-#define CONFIG_SYS_NO_FLASH		1
-
 #define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* 256 KiB */
 #define CONFIG_IDENT_STRING		" for SMDKC100"
 
@@ -203,8 +172,6 @@ 
 #define CONFIG_SAMSUNG_ONENAND		1
 #define CONFIG_SYS_ONENAND_BASE		0xE7100000
 
-#define CONFIG_DOS_PARTITION		1
-
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_LOAD_ADDR - 0x1000000)
 
 /*
@@ -217,4 +184,6 @@ 
 #define CONFIG_ENV_SROM_BANK   3       /* Select SROM Bank-3 for Ethernet*/
 #endif /* CONFIG_CMD_NET */
 
+#define CONFIG_DEFAULT_DEVICE_TREE	s5pc1xx-smdkc100
+
 #endif	/* __CONFIG_H */