Convert CONFIG_BOOTP_MAY_FAIL et al to Kconfig

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

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 52fc15d..b956bd9 100644 (file)
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -7,7 +7,7 @@
 #ifndef __VEXPRESS_AEMV8_H
 #define __VEXPRESS_AEMV8_H
 
-#define CONFIG_REMAKE_ELF
+#include <linux/stringify.h>
 
 /* Link Definitions */
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
@@ -86,8 +86,8 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-#ifndef CONFIG_TARGET_VEXPRESS64_JUNO
-/* The Vexpress64 simulators use SMSC91C111 */
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
+/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
 #define CONFIG_SMC91111                        1
 #define CONFIG_SMC91111_BASE           (V2M_PA_BASE + 0x01A000000)
 #endif
@@ -99,9 +99,6 @@
 #define CONFIG_PL011_CLOCK             24000000
 #endif
 
-/* BOOTP options */
-#define CONFIG_BOOTP_BOOTFILESIZE
-
 /* Miscellaneous configurable options */
 
 /* Physical Memory Map */
@@ -172,15 +169,22 @@
                                BOOTENV
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
+
+#define VEXPRESS_KERNEL_ADDR   0x80080000
+#define VEXPRESS_FDT_ADDR      0x8fc00000
+#define VEXPRESS_BOOT_ADDR     0x8fd00000
+#define VEXPRESS_RAMDISK_ADDR  0x8fe00000
+
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=Image\0"           \
-                               "kernel_addr=0x80080000\0"      \
-                               "initrd_name=ramdisk.img\0"     \
-                               "initrd_addr=0x88000000\0"      \
-                               "fdtfile=devtree.dtb\0"         \
-                               "fdt_addr=0x83000000\0"         \
-                               "boot_name=boot.img\0"          \
-                               "boot_addr=0x8007f800\0"
+                               "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \
+                               "ramdisk_name=ramdisk.img\0"    \
+                               "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \
+                               "fdtfile=devtree.dtb\0" \
+                               "fdt_addr_r=" __stringify(VEXPRESS_FDT_ADDR) "\0"       \
+                               "boot_name=boot.img\0" \
+                               "boot_addr_r=" __stringify(VEXPRESS_BOOT_ADDR) "\0"
+
 #endif
 
 /* Monitor Command Prompt */
@@ -201,7 +205,6 @@
 #endif
 
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW