Merge branch '2021-07-28-build-improvements'

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

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 2ea50f5..6199f0d 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -12,15 +12,23 @@
 
 #include "imx6_spl.h"
 
+#ifdef CONFIG_SPL_OS_BOOT
+/* Falcon Mode */
+#define CONFIG_SPL_FS_LOAD_ARGS_NAME   "args"
+#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage"
+#define CONFIG_SYS_SPL_ARGS_ADDR   0x18000000
+
+/* Falcon Mode - MMC support: args@1MB kernel@2MB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */
+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (CONFIG_CMD_SPL_WRITE_SIZE / 512)
+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR        0x1000  /* 2MB */
+#endif
+
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (35 * SZ_1M) /* Increase due to DFU */
 
-#define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART1_BASE
 
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-
 /* MMC Configuration */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC3_BASE_ADDR
 #define CONFIG_SUPPORT_EMMC_BOOT
@@ -30,7 +38,6 @@
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT 300
 
 #define CONFIG_DFU_ENV_SETTINGS \
@@ -42,13 +49,13 @@
 
 #define BOOTMENU_ENV \
        "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
-               "setenv baseboard hobbit\0" \
+               "setenv baseboard hobbit; saveenv; run base_boot\0" \
        "bootmenu_1=Boot using PICO-Pi baseboard=" \
-               "setenv baseboard pi\0" \
+               "setenv baseboard pi; saveenv; run base_boot\0" \
        "bootmenu_2=Boot using PICO-Dwarf baseboard=" \
-               "setenv baseboard dwarf\0" \
+               "setenv baseboard dwarf; saveenv; run base_boot\0" \
        "bootmenu_3=Boot using PICO-Nymph baseboard=" \
-               "setenv baseboard nymph\0" \
+               "setenv baseboard nymph; saveenv; run base_boot\0" \
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0\0" \
@@ -61,11 +68,6 @@
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
        CONFIG_DFU_ENV_SETTINGS \
        "finduuid=part uuid mmc 0:1 uuid\0" \
-       "findbaseboard=" \
-               "if test $baseboard = ask ; then " \
-                       "bootmenu -1; fi;" \
-               "if test $baseboard != ask ; then " \
-                       "saveenv; fi;\0" \
        "findfdt="\
                "if test $baseboard = hobbit && test $board_rev = MX6Q ; then " \
                        "setenv fdtfile imx6q-pico-hobbit.dtb; fi; " \
@@ -85,6 +87,13 @@
                        "setenv fdtfile imx6dl-pico-nymph.dtb; fi; " \
                "if test $fdtfile = ask; then " \
                        "echo WARNING: Could not determine dtb to use; fi; \0" \
+       "default_boot=" \
+               "if test $baseboard = ask ; then " \
+                       "bootmenu -1; " \
+               "else " \
+                       "run base_boot;" \
+               "fi; \0" \
+       "base_boot=run findfdt; run finduuid; run distro_bootcmd\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "ramdisk_addr_r=0x13000000\0" \
@@ -111,10 +120,8 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_SIZE                        (8 * 1024)
 
 /* Environment starts at 768k = 768 * 1024 = 786432 */
-#define CONFIG_ENV_OFFSET              786432
 /*
  * Detect overlap between U-Boot image and environment area in build-time
  *
@@ -125,6 +132,19 @@
  * write the direct value here
  */
 #define CONFIG_BOARD_SIZE_LIMIT                715776
-#define CONFIG_SYS_MMC_ENV_DEV         0
+
+/* Ethernet Configuration */
+#define CONFIG_FEC_MXC
+#define CONFIG_MII
+#define IMX_FEC_BASE                   ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE            RGMII
+#define CONFIG_ETHPRIME                        "FEC"
+#define CONFIG_FEC_MXC_PHYADDR         1
+
+/* Framebuffer */
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_IMX_HDMI
+#define CONFIG_IMX_VIDEO_SKIP
 
 #endif                        /* __CONFIG_H * */