Convert CONFIG_USE_ONENAND_BOARD_INIT to Kconfig

[J-u-boot.git] / include / configs / s5p_goni.h

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index b4a3cc0445c3cfa57e10bd5d937e4083c5f2e30e..8208f14e09e0e9b0c9aeabf7a6780b55e7593ca8 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -10,17 +10,9 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* High Level Configuration Options */
-#define CONFIG_SAMSUNG         1       /* in a SAMSUNG core */
-#define CONFIG_S5P             1       /* which is in a S5P Family */
-#define CONFIG_S5PC110         1       /* which is in a S5PC110 */
-
 #include <linux/sizes.h>
 #include <asm/arch/cpu.h>              /* get chip and board defs */
 
-/* input clock of PLL: has 24MHz input clock at S5PC110 */
-#define CONFIG_SYS_CLK_FREQ_C110       24000000
-
 /* DRAM Base */
 #define CONFIG_SYS_SDRAM_BASE          0x30000000
 
@@ -29,9 +21,6 @@
 /* MMC */
 #define SDHCI_MAX_HOSTS                4
 
-/* PWM */
-#define CONFIG_PWM                     1
-
 /* USB Composite download gadget - g_dnl */
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
@@ -70,20 +59,14 @@
        "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
        "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
-#define CONFIG_BOOTCOMMAND     "run mmcboot"
-
-#define CONFIG_RAMDISK_BOOT    "root=/dev/ram0 rw rootfstype=ext4" \
-               " ${console} ${meminfo}"
-
-#define CONFIG_COMMON_BOOT     "${console} ${meminfo} ${mtdparts}"
-
-#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \
-                       " onenand write 0x32008000 0x0 0x100000\0"
+#define COMMON_BOOT    "${console} ${meminfo} ${mtdparts}"
 
 #define CONFIG_MISC_COMMON
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       CONFIG_UPDATEB \
+       "updateb=" \
+               "onenand erase 0x0 0x100000;" \
+               "onenand write 0x32008000 0x0 0x100000\0" \
        "updatek=" \
                "onenand erase 0xc00000 0x600000;" \
                "onenand write 0x31008000 0xc00000 0x600000\0" \
@@ -96,22 +79,23 @@
        "flashboot=" \
                "set bootargs root=/dev/mtdblock${bootblock} " \
                "rootfstype=${rootfstype} ${opts} " \
-               "${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
+               "${lcdinfo} " COMMON_BOOT "; run bootk\0" \
        "ubifsboot=" \
                "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
                "${opts} ${lcdinfo} " \
-               CONFIG_COMMON_BOOT "; run bootk\0" \
+               COMMON_BOOT "; run bootk\0" \
        "tftpboot=" \
                "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
-               "${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \
+               "${opts} ${lcdinfo} " COMMON_BOOT \
                "; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \
        "ramboot=" \
-               "set bootargs " CONFIG_RAMDISK_BOOT \
+               "set bootargs root=/dev/ram0 rw rootfstype=ext4" \
+               " ${console} ${meminfo} " \
                "initrd=0x33000000,8M ramdisk=8192\0" \
        "mmcboot=" \
                "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
                "rootfstype=${rootfstype} ${opts} ${lcdinfo} " \
-               CONFIG_COMMON_BOOT "; run bootk\0" \
+               COMMON_BOOT "; run bootk\0" \
        "boottrace=setenv opts initcall_debug; run bootcmd\0" \
        "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
        "verify=n\0" \
@@ -129,8 +113,6 @@
        "opts=always_resume=1\0" \
        "dfu_alt_info=" CONFIG_DFU_ALT "\0"
 
-#define CONFIG_SYS_PBSIZE      384     /* Print Buffer Size */
-
 /* Goni has 3 banks of DRAM, but swap the bank */
 #define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE   /* OneDRAM Bank #0 */
 #define PHYS_SDRAM_1_SIZE      (80 << 20)              /* 80 MB in Bank #0 */
@@ -139,18 +121,13 @@
 #define PHYS_SDRAM_3           0x50000000              /* mDDR DMC2 Bank #2 */
 #define PHYS_SDRAM_3_SIZE      (128 << 20)             /* 128 MB in Bank #2 */
 
-#define CONFIG_SYS_MONITOR_BASE                0x00000000
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* 256 KiB */
 
 /* FLASH and environment organization */
 #define CONFIG_MMC_DEFAULT_DEV 0
 
-#define CONFIG_USE_ONENAND_BOARD_INIT
-#define CONFIG_SAMSUNG_ONENAND         1
 #define CONFIG_SYS_ONENAND_BASE                0xB0000000
 
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR - 0x1000000)
-
 #define CONFIG_USB_GADGET_DWC2_OTG_PHY
 
 #endif /* __CONFIG_H */