flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / include / configs / dragonboard410c.h

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index a63440fe8b79dbb1db2175f764ed937bd3310ca5..7f0742abbbd661692891f8502fc066a404890f2e 100644 (file)
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -12,8 +12,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/sysmap-apq8016.h>
 
-#define CONFIG_IDENT_STRING            "\nQualcomm-DragonBoard 410C"
-
 #define CONFIG_MISC_INIT_R /* To stop autoboot */
 
 /* Physical Memory Map */
@@ -33,11 +31,6 @@
 /* Generic Timer Definitions */
 #define COUNTER_FREQUENCY              19000000
 
-/* This are needed to have proper mmc support */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_SDHCI
-
 #define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds"
 
 /* Fixup - in init code we switch from device to host mode,
@@ -57,25 +50,16 @@
 #define CONFIG_MD5
 
 /* Extra Commands */
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_GPIO
-#define CONFIG_CMD_GPT
 #define CONFIG_CMD_MD5SUM
-#define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MMC
 /* Enable that for switching of boot partitions */
 /* Disabled by default as some sub-commands can brick eMMC */
 /*#define CONFIG_SUPPORT_EMMC_BOOT */
-#define CONFIG_CMD_PART
 #define CONFIG_CMD_REGINFO     /* Register dump                */
 #define CONFIG_CMD_TFTP
-#define CONFIG_CMD_TIMER
-#define CONFIG_CMD_UNZIP
 
 /* Partition table support */
 #define HAVE_BLOCK_DEVICE /* Needed for partition commands */
-#define CONFIG_PARTITION_UUIDS
 
 #include <config_distro_defaults.h>
 
@@ -87,8 +71,8 @@
 
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
-       func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \
+       func(MMC, mmc, 0) \
        func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>
@@ -100,7 +84,6 @@
 "tftp $loadaddr "#file" && " \
 "mmc write $loadaddr $start $size && "
 
-
 #define CONFIG_ENV_REFLASH \
 "mmc dev 0 && "\
 "usb start && "\
@@ -126,16 +109,17 @@ REFLASH(dragonboard/u-boot.img, 8)\
        "fdt_high=0xffffffffffffffff\0" \
        "initrd_high=0xffffffffffffffff\0" \
        "linux_image=Image\0" \
-       "linux_addr=0x81000000\0"\
-       "fdt_image=apq8016-sbc.dtb\0" \
-       "fdt_addr=0x83000000\0"\
-       "ramdisk_addr=0x84000000\0"\
+       "kernel_addr_r=0x81000000\0"\
+       "fdtfile=apq8016-sbc.dtb\0" \
+       "fdt_addr_r=0x83000000\0"\
+       "ramdisk_addr_r=0x84000000\0"\
+       "scriptaddr=0x90000000\0"\
+       "pxefile_addr_r=0x90100000\0"\
        BOOTENV
 
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_SYS_NO_FLASH
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + SZ_8M)