Merge branch 'master' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git] / include / configs / omap3_evm.h
index df50325ab66da93688d95405ee23aae0409a304c..8e98977de8e858c9504873d9af57363d315d472b 100644 (file)
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration settings for the TI OMAP3 EVM board.
  *
  *     Syed Mohammed Khasim <khasim@ti.com>
  *
  * Manikandan Pillai <mani.pillai@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_NR_DRAM_BANKS            2 /* CS1 may or may not be populated */
-
 #include <configs/ti_omap3_common.h>
 
 /*
  * We are only ever GP parts and will utilize all of the "downloaded image"
  * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
  */
-#undef CONFIG_SPL_TEXT_BASE
-#define CONFIG_SPL_TEXT_BASE            0x40200000
-
-#define CONFIG_SPL_FRAMEWORK
 
-#define CONFIG_MISC_INIT_R
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
 
-/* Override OMAP3 serial console configuration */
-#undef CONFIG_CONS_INDEX
-#define CONFIG_CONS_INDEX               1
-#define CONFIG_SYS_NS16550_COM1         OMAP34XX_UART1
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_SYS_NS16550_REG_SIZE
-#else /* !CONFIG_SPL_BUILD  */
-#define CONFIG_SYS_NS16550_REG_SIZE     (-1)
-#endif /* CONFIG_SPL_BUILD */
-
 /* NAND */
 #if defined(CONFIG_NAND)
 #define CONFIG_SYS_FLASH_BASE          NAND_BASE
 #define CONFIG_SYS_NAND_ECCSIZE         512
 #define CONFIG_SYS_NAND_ECCBYTES        3
 #define CONFIG_NAND_OMAP_ECCSCHEME      OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
-#define CONFIG_SYS_NAND_U_BOOT_OFFS     0x80000
-#define CONFIG_ENV_IS_IN_NAND           1
-#define CONFIG_ENV_SIZE                 (128 << 10) /* 128 KiB */
-#define CONFIG_SYS_ENV_SECT_SIZE        (128 << 10) /* 128 KiB */
-#define CONFIG_ENV_OFFSET               0x260000
+#define CONFIG_SYS_ENV_SECT_SIZE        SZ_128K
 #define CONFIG_ENV_ADDR                 0x260000
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_MTD_PARTITIONS           /* required for UBI partition support */
 /* NAND: SPL falcon mode configs */
 #if defined(CONFIG_SPL_OS_BOOT)
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
 #endif /* CONFIG_SPL_OS_BOOT */
 #endif /* CONFIG_NAND */
 
-/* MUSB */
-#define CONFIG_USB_OMAP3
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
+#define MEM_LAYOUT_ENV_SETTINGS \
+       DEFAULT_LINUX_BOOT_ENV
+
+#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
+       "bootcmd_" #devtypel #instance "=" \
+       "setenv mmcdev " #instance "; " \
+       "run mmcboot\0"
+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
+       #devtypel #instance " "
+
+#if defined(CONFIG_NAND)
+
+#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
+       "bootcmd_" #devtypel #instance "=" \
+       "if test ${mtdids} = '' || test ${mtdparts} = '' ; then " \
+               "echo NAND boot disabled: No mtdids and/or mtdparts; " \
+       "else " \
+               "run nandboot; " \
+       "fi\0"
+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
+       #devtypel #instance " "
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(LEGACY_MMC, legacy_mmc, 0) \
+       func(UBIFS, ubifs, 0) \
+       func(NAND, nand, 0)
+
+#else /* !CONFIG_NAND */
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(LEGACY_MMC, legacy_mmc, 0)
 
-/* USB EHCI */
-#define CONFIG_SYS_USB_FAT_BOOT_PARTITION  1
+#endif /* CONFIG_NAND */
 
-/* Environment */
-#define CONFIG_PREBOOT                  "usb start"
+#include <config_distro_bootcmd.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       DEFAULT_LINUX_BOOT_ENV \
+       MEM_LAYOUT_ENV_SETTINGS \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       "fdt_high=0xffffffff\0" \
+       "console=ttyO0,115200n8\0" \
+       "bootdir=/boot\0" \
        "bootenv=uEnv.txt\0" \
+       "bootfile=zImage\0" \
+       "bootpart=0:2\0" \
+       "bootubivol=rootfs\0" \
+       "bootubipart=rootfs\0" \
        "optargs=\0" \
        "mmcdev=0\0" \
-       "console=ttyO0,115200n8\0" \
+       "mmcpart=2\0" \
+       "mmcroot=/dev/mmcblk0p2 rw\0" \
+       "mmcrootfstype=ext4 rootwait\0" \
        "mmcargs=setenv bootargs console=${console} " \
                "${mtdparts} " \
                "${optargs} " \
-               "root=/dev/mmcblk0p2 rw " \
-               "rootfstype=ext4 rootwait\0" \
-       "nandargs=setenv bootargs console=${console} " \
-               "${mtdparts} " \
-               "${optargs} " \
-               "root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd " \
-               "rootfstype=ubifs rootwait\0" \
+               "root=${mmcroot} " \
+               "rootfstype=${mmcrootfstype}\0" \
        "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-       "importbootenv=echo Importing environment from mmc ...; " \
+       "ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \
+       "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
                "env import -t ${loadaddr} ${filesize}\0" \
-       "bootscript=echo Running bootscript from mmc ...; " \
-               "source ${loadaddr}\0" \
-       "loaduimage=setenv bootfile uImage; " \
-               "fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-       "loadzimage=setenv bootfile zImage; " \
-               "fatload mmc ${mmcdev} ${loadaddr} zImage\0" \
-       "loaddtb=fatload mmc ${mmcdev} ${fdtaddr} " CONFIG_DEFAULT_FDT_FILE "\0" \
-       "mmcboot=echo Booting ${bootfile} from mmc ...; " \
-               "run mmcargs; " \
-               "bootm ${loadaddr} - ${fdtaddr}\0" \
-       "mmcbootz=echo Booting ${bootfile} from mmc ...; " \
-               "run mmcargs; " \
-               "bootz ${loadaddr} - ${fdtaddr}\0" \
-       "nandboot=echo Booting uImage from nand ...; " \
-               "run nandargs; " \
-               "nand read ${loadaddr} kernel; " \
-               "nand read ${fdtaddr} dtb; " \
-               "bootm ${loadaddr} - ${fdtaddr}\0"
-
-#define CONFIG_BOOTCOMMAND \
-       "mmc dev ${mmcdev}; if mmc rescan; then " \
-               "if run loadbootenv; then " \
-                       "run importbootenv; " \
+       "mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \
+               "mmc dev ${mmcdev}; " \
+               "if mmc rescan; then " \
+                       "run loadbootenv && run importbootenv; " \
+                       "run ext4bootenv && run importbootenv; " \
                        "if test -n $uenvcmd; then " \
                                "echo Running uenvcmd ...; " \
                                "run uenvcmd; " \
                        "fi; " \
-               "else " \
-                       "if run loadzimage && run loaddtb; then " \
-                               "run mmcbootz; fi; " \
-                       "if run loaduimage && run loaddtb; then " \
-                               "run mmcboot; fi; " \
-                       "run nandboot; " \
-               "fi; " \
-       "else run nandboot; fi"
+               "fi\0" \
+       "loadimage=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
+       "loaddtb=ext4load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+       "mmcboot=run mmcbootenv; " \
+               "if run loadimage && run loaddtb; then " \
+                       "echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} ...; " \
+                       "run mmcargs; " \
+                       "if test ${bootfile} = uImage; then " \
+                               "bootm ${loadaddr} - ${fdtaddr}; " \
+                       "fi; " \
+                       "if test ${bootfile} = zImage; then " \
+                               "bootz ${loadaddr} - ${fdtaddr}; " \
+                       "fi; " \
+               "fi\0" \
+       "nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd\0" \
+       "nandrootfstype=ubifs rootwait\0" \
+       "nandargs=setenv bootargs console=${console} " \
+               "${mtdparts} " \
+               "${optargs} " \
+               "root=${nandroot} " \
+               "rootfstype=${nandrootfstype}\0" \
+       "nandboot=if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \
+                       "echo Booting uImage from NAND MTD 'kernel' partition ...; " \
+                       "run nandargs; " \
+                       "bootm ${loadaddr} - ${fdtaddr}; " \
+               "fi\0" \
+       BOOTENV
 
 #endif /* __CONFIG_H */