Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / odroid.h

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 281922a..7255efc 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -13,33 +13,22 @@
 
 #include <configs/exynos4-common.h>
 
-#define CONFIG_SYS_L2CACHE_OFF
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
-#define CONFIG_SYS_PL310_BASE  0x10502000
+#define CFG_SYS_PL310_BASE     0x10502000
 #endif
 
-#define CONFIG_SYS_SDRAM_BASE  0x40000000
+#define CFG_SYS_BOOTMAPSZ      0x10000000
+#define CFG_SYS_SDRAM_BASE     0x40000000
 #define SDRAM_BANK_SIZE                (256 << 20)     /* 256 MB */
-#define PHYS_SDRAM_1           CONFIG_SYS_SDRAM_BASE
-/* Reserve the last 1 MiB for the secure firmware */
-#define CONFIG_SYS_MEM_TOP_HIDE                (1UL << 20UL)
-#define CONFIG_TZSW_RESERVED_DRAM_SIZE CONFIG_SYS_MEM_TOP_HIDE
+#define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
 
 #include <linux/sizes.h>
 
-#define CONFIG_BOOTCOMMAND             "run distro_bootcmd ; run autoboot"
-
-#define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
-                                       - GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_MONITOR_BASE        0x00000000
-
 /* Partitions name */
 #define PARTS_BOOT             "boot"
 #define PARTS_ROOT             "platform"
 
-#define CONFIG_DFU_ALT \
+#define CFG_DFU_ALT \
        "uImage fat 0 1;" \
        "zImage fat 0 1;" \
        "Image.itb fat 0 1;" \
@@ -49,15 +38,15 @@
        ""PARTS_BOOT" part 0 1;" \
        ""PARTS_ROOT" part 0 2\0" \
 
-#define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN        (SZ_1K)
 
-#define CONFIG_DFU_ALT_BOOT_EMMC \
+#define CFG_DFU_ALT_BOOT_EMMC \
        "u-boot raw 0x3e 0x800 mmcpart 1;" \
        "bl1 raw 0x0 0x1e mmcpart 1;" \
        "bl2 raw 0x1e 0x1d mmcpart 1;" \
        "tzsw raw 0x83e 0x138 mmcpart 1\0"
 
-#define CONFIG_DFU_ALT_BOOT_SD \
+#define CFG_DFU_ALT_BOOT_SD \
        "u-boot raw 0x3f 0x800;" \
        "bl1 raw 0x1 0x1e;" \
        "bl2 raw 0x1f 0x1d;" \
@@ -83,7 +72,7 @@
  * 1.  BOOT:  100MiB 2MiB
  * 2.  ROOT:  -
 */
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CFG_EXTRA_ENV_SETTINGS \
        "loadbootscript=load mmc ${mmcbootdev}:${mmcbootpart} ${scriptaddr} " \
                "boot.scr\0" \
        "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kernel_addr_r} " \
@@ -144,7 +133,7 @@
        "mmcbootpart=1\0" \
        "mmcrootdev=0\0" \
        "mmcrootpart=2\0" \
-       "dfu_alt_system="CONFIG_DFU_ALT \
+       "dfu_alt_system="CFG_DFU_ALT \
        "dfu_alt_info=Please reset the board\0" \
        "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \
        "consoleoff=set console console=ram; save; reset\0" \
@@ -155,18 +144,4 @@
        "kernel_addr_r=0x41000000\0" \
        BOOTENV
 
-/* GPT */
-
-/* Security subsystem - enable hw_rand() */
-#define CONFIG_EXYNOS_ACE_SHA
-
-/* USB */
-#define CONFIG_USB_EHCI_EXYNOS
-
-/*
- * Supported Odroid boards: X3, U3
- * TODO: Add Odroid X support
- */
-#define CONFIG_MISC_COMMON
-
 #endif /* __CONFIG_H */