MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig

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

diff --git a/include/configs/apple.h b/include/configs/apple.h
index 9cf20fc..b06660a 100644 (file)
--- a/include/configs/apple.h
+++ b/include/configs/apple.h
@@ -3,17 +3,17 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_SYS_SDRAM_BASE  0x880000000
-
 /* Environment */
 #define ENV_DEVICE_SETTINGS \
-       "stdin=serial,usbkbd\0" \
+       "stdin=serial,usbkbd,spikbd\0" \
        "stdout=serial,vidconsole\0" \
        "stderr=serial,vidconsole\0"
 
-#define ENV_MEM_LAYOUT_SETTINGS \
-       "fdt_addr_r=0x960100000\0" \
-       "kernel_addr_r=0x960200000\0"
+#if CONFIG_IS_ENABLED(CMD_NVME)
+       #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
+#else
+       #define BOOT_TARGET_NVME(func)
+#endif
 
 #if CONFIG_IS_ENABLED(CMD_USB)
        #define BOOT_TARGET_USB(func) func(USB, usb, 0)
@@ -22,13 +22,13 @@
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \
+       BOOT_TARGET_NVME(func) \
        BOOT_TARGET_USB(func)
 
 #include <config_distro_bootcmd.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        ENV_DEVICE_SETTINGS \
-       ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV
 
 #endif