Convert CONFIG_SKIP_LOWLEVEL_INIT et al to Kconfig

[J-u-boot.git] / include / configs / am43xx_evm.h

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index ed71f4ce56ace9ec24275e12fcecf7e08ee0631d..83fc00de31f54fd168427cf8ca570789098b984d 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_AM43XX_EVM_H
 #define __CONFIG_AM43XX_EVM_H
 
 #ifndef __CONFIG_AM43XX_EVM_H
 #define __CONFIG_AM43XX_EVM_H
 

-#define CONFIG_ARCH_CPU_INIT

 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 21)    /* 2GB */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 21)    /* 2GB */
 #define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
 


@@ -22,12 +21,9 @@
 #endif
 
 /* I2C Configuration */
 #endif
 
 /* I2C Configuration */

-#define CONFIG_ENV_EEPROM_IS_ON_I2C
-#define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2

 
 /* Power */
 
 /* Power */

-#ifndef CONFIG_DM_I2C
+#if !CONFIG_IS_ENABLED(DM_I2C)

 #define CONFIG_POWER
 #define CONFIG_POWER_I2C
 #endif
 #define CONFIG_POWER
 #define CONFIG_POWER_I2C
 #endif


@@ -35,7 +31,6 @@
 #define CONFIG_POWER_TPS62362
 
 /* SPL defines. */
 #define CONFIG_POWER_TPS62362
 
 /* SPL defines. */

-#define CONFIG_SPL_TEXT_BASE           CONFIG_ISW_ENTRY_ADDR

 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
                                         (128 << 20))
 
 #define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
                                         (128 << 20))
 


@@ -43,14 +38,6 @@
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  0x48242000
 
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  0x48242000
 

-/*
- * Since SPL did pll and ddr initialization for us,
- * we don't need to do it twice.
- */
-#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_QSPI_BOOT)
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
-

 /*
  * When building U-Boot such that there is no previous loader
  * we need to call board_early_init_f.  This is taken care of in
 /*
  * When building U-Boot such that there is no previous loader
  * we need to call board_early_init_f.  This is taken care of in


@@ -60,9 +47,6 @@
 /* Now bring in the rest of the common code. */
 #include <configs/ti_armv7_omap.h>
 
 /* Now bring in the rest of the common code. */
 #include <configs/ti_armv7_omap.h>
 

-/* Always 64 KiB env size */
-#define CONFIG_ENV_SIZE                        (64 << 10)
-

 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)
 /* Clock Defines */
 #define V_OSCK                         24000000  /* Clock output from T2 */
 #define V_SCLK                         (V_OSCK)


@@ -72,7 +56,7 @@
 
 /* SPL USB Support */
 
 
 /* SPL USB Support */
 

-#if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_SPL_USB_HOST) || !defined(CONFIG_SPL_BUILD)

 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION              1
 #define CONFIG_USB_XHCI_OMAP
 
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION              1
 #define CONFIG_USB_XHCI_OMAP
 


@@ -113,75 +97,41 @@
 #define DFUARGS
 #endif
 
 #define DFUARGS
 #endif
 

-#ifdef CONFIG_QSPI_BOOT
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ           CONFIG_SF_DEFAULT_SPEED
-#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64 KB sectors */
-#define CONFIG_ENV_OFFSET              0x110000
-#define CONFIG_ENV_OFFSET_REDUND       0x120000
-#endif
+#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
+       "bootcmd_" #devtypel "=" \
+       "run nandboot\0"
+
+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
+       #devtypel #instance " "
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(NAND, nand, 0) \
+       func(PXE, pxe, na) \
+       func(DHCP, dhcp, na)

 
 

-/* SPI */
-#define CONFIG_TI_SPI_MMAP
-#define CONFIG_QSPI_SEL_GPIO                   48
-#define CONFIG_SF_DEFAULT_SPEED                48000000
-#define CONFIG_SF_DEFAULT_MODE                 SPI_MODE_3
-#define CONFIG_QSPI_QUAD_SUPPORT
-#define CONFIG_TI_EDMA3
+#include <config_distro_bootcmd.h>

 
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>
 
 #ifndef CONFIG_SPL_BUILD
 #include <environment/ti/dfu.h>

-#include <environment/ti/mmc.h>

 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \

-       DEFAULT_MMC_TI_ARGS \
-       DEFAULT_FIT_TI_ARGS \

        "fdtfile=undefined\0" \
        "fdtfile=undefined\0" \

-       "bootpart=0:2\0" \
-       "bootdir=/boot\0" \
-       "bootfile=zImage\0" \
+       "finduuid=part uuid mmc 0:2 uuid\0" \

        "console=ttyO0,115200n8\0" \
        "partitions=" \
                "uuid_disk=${uuid_gpt_disk};" \
                "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
        "optargs=\0" \
        "console=ttyO0,115200n8\0" \
        "partitions=" \
                "uuid_disk=${uuid_gpt_disk};" \
                "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
        "optargs=\0" \

-       "usbroot=/dev/sda2 rw\0" \
-       "usbrootfstype=ext4 rootwait\0" \
-       "usbdev=0\0" \

        "ramroot=/dev/ram0 rw\0" \
        "ramrootfstype=ext2\0" \
        "ramroot=/dev/ram0 rw\0" \
        "ramrootfstype=ext2\0" \

-       "usbargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "root=${usbroot} " \
-               "rootfstype=${usbrootfstype}\0" \

        "ramargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${ramroot} " \
                "rootfstype=${ramrootfstype}\0" \
        "loadramdisk=load ${devtype} ${devnum} ${rdaddr} ramdisk.gz\0" \
        "ramargs=setenv bootargs console=${console} " \
                "${optargs} " \
                "root=${ramroot} " \
                "rootfstype=${ramrootfstype}\0" \
        "loadramdisk=load ${devtype} ${devnum} ${rdaddr} ramdisk.gz\0" \

-       "usbboot=" \
-               "setenv devnum ${usbdev}; " \
-               "setenv devtype usb; " \
-               "usb start ${usbdev}; " \
-               "if usb dev ${usbdev}; then " \
-                       "if run loadbootenv; then " \
-                               "echo Loaded environment from ${bootenv};" \
-                               "run importbootenv;" \
-                       "fi;" \
-                       "if test -n $uenvcmd; then " \
-                               "echo Running uenvcmd ...;" \
-                               "run uenvcmd;" \
-                       "fi;" \
-                       "if run loadimage; then " \
-                               "run loadfdt; " \
-                               "echo Booting from usb ${usbdev}...; " \
-                               "run usbargs;" \
-                               "bootz ${loadaddr} - ${fdtaddr}; " \
-                       "fi;" \
-               "fi\0" \
-               "fi;" \
-               "usb stop ${usbdev};\0" \

        "findfdt="\
                "if test $board_name = AM43EPOS; then " \
                        "setenv fdtfile am43x-epos-evm.dtb; fi; " \
        "findfdt="\
                "if test $board_name = AM43EPOS; then " \
                        "setenv fdtfile am43x-epos-evm.dtb; fi; " \


@@ -198,24 +148,12 @@
        NANDARGS \
        NETARGS \
        DFUARGS \
        NANDARGS \
        NETARGS \
        DFUARGS \

-
-#define CONFIG_BOOTCOMMAND \
-       "if test ${boot_fit} -eq 1; then "      \
-               "run update_to_fit;"    \
-       "fi;"   \
-       "run findfdt; " \
-       "run envboot;" \
-       "run mmcboot;" \
-       "run usbboot;" \
-       NANDBOOT \
+       BOOTENV

 
 #endif
 
 #ifndef CONFIG_SPL_BUILD
 /* CPSW Ethernet */
 
 #endif
 
 #ifndef CONFIG_SPL_BUILD
 /* CPSW Ethernet */

-#define CONFIG_BOOTP_DEFAULT
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME

 #define CONFIG_NET_RETRY_COUNT         10
 #endif
 
 #define CONFIG_NET_RETRY_COUNT         10
 #endif
 


@@ -224,7 +162,7 @@
 #define CONFIG_SYS_RX_ETH_BUFFER       64
 
 /* NAND support */
 #define CONFIG_SYS_RX_ETH_BUFFER       64
 
 /* NAND support */

-#ifdef CONFIG_NAND
+#ifdef CONFIG_MTD_RAW_NAND

 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_PAGE_SIZE      4096
 #define CONFIG_SYS_NAND_OOBSIZE                224
 /* NAND: device related configs */
 #define CONFIG_SYS_NAND_PAGE_SIZE      4096
 #define CONFIG_SYS_NAND_OOBSIZE                224


@@ -281,10 +219,10 @@
                "nand read ${loadaddr} NAND.kernel; " \
                "bootz ${loadaddr} - ${fdtaddr}\0"
 #define NANDBOOT                       "run nandboot; "
                "nand read ${loadaddr} NAND.kernel; " \
                "bootz ${loadaddr} - ${fdtaddr}\0"
 #define NANDBOOT                       "run nandboot; "

-#else /* !CONFIG_NAND */
+#else /* !CONFIG_MTD_RAW_NAND */

 #define NANDARGS
 #define NANDBOOT
 #define NANDARGS
 #define NANDBOOT

-#endif /* CONFIG_NAND */
+#endif /* CONFIG_MTD_RAW_NAND */

 
 #if defined(CONFIG_TI_SECURE_DEVICE)
 /* Avoid relocating onto firewalled area at end of DRAM */
 
 #if defined(CONFIG_TI_SECURE_DEVICE)
 /* Avoid relocating onto firewalled area at end of DRAM */