Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig

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

diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index 78b1615..865055a 100644 (file)
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -8,7 +8,7 @@
 #define __MESON64_CONFIG_H
 
 /* Generic Interrupt Controller Definitions */
-#if defined(CONFIG_MESON_AXG)
+#if (defined(CONFIG_MESON_AXG) || defined(CONFIG_MESON_G12A))
 #define GICD_BASE                      0xffc01000
 #define GICC_BASE                      0xffc02000
 #else /* MESON GXL and GXBB */
@@ -18,12 +18,6 @@
 
 /* For splashscreen */
 #ifdef CONFIG_DM_VIDEO
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_BMP_16BPP
-#define CONFIG_BMP_24BPP
-#define CONFIG_BMP_32BPP
-#define CONFIG_SPLASH_SCREEN
-#define CONFIG_SPLASH_SCREEN_ALIGN
 #define STDOUT_CFG "vidconsole,serial"
 #else
 #define STDOUT_CFG "serial"
@@ -37,14 +31,14 @@
 
 #define CONFIG_CPU_ARMV8
 #define CONFIG_REMAKE_ELF
-#define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_SYS_MAXARGS             32
+#ifndef CONFIG_SYS_MALLOC_LEN
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)
+#endif
 #define CONFIG_SYS_CBSIZE              1024
 
 #define CONFIG_SYS_SDRAM_BASE          0
 #define CONFIG_SYS_INIT_SP_ADDR                0x20000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_BOOTM_LEN           (64 << 20) /* 64 MiB */
 
 /* ROM USB boot support, auto-execute boot.scr at scriptaddr */
@@ -65,6 +59,12 @@
 #define BOOT_TARGET_DEVICES_USB(func)
 #endif
 
+#ifdef CONFIG_CMD_NVME
+       #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
+#else
+       #define BOOT_TARGET_NVME(func)
+#endif
+
 #ifndef BOOT_TARGET_DEVICES
 #define BOOT_TARGET_DEVICES(func) \
        func(ROMUSB, romusb, na)  \
@@ -72,24 +72,29 @@
        func(MMC, mmc, 1) \
        func(MMC, mmc, 2) \
        BOOT_TARGET_DEVICES_USB(func) \
+       BOOT_TARGET_NVME(func) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 #endif
 
+#include <config_distro_bootcmd.h>
+
 #ifndef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "stdin=" STDIN_CFG "\0" \
        "stdout=" STDOUT_CFG "\0" \
        "stderr=" STDOUT_CFG "\0" \
+       "kernel_comp_addr_r=0x0d080000\0" \
+       "kernel_comp_size=0x2000000\0" \
        "fdt_addr_r=0x08008000\0" \
        "scriptaddr=0x08000000\0" \
        "kernel_addr_r=0x08080000\0" \
        "pxefile_addr_r=0x01080000\0" \
+       "fdtoverlay_addr_r=0x01000000\0" \
        "ramdisk_addr_r=0x13000000\0" \
        "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
        BOOTENV
 #endif
 
-#include <config_distro_bootcmd.h>
 
 #endif /* __MESON64_CONFIG_H */