Merge tag 'dm-pull-29oct19' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / include / configs / apalis-tk1.h

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 10f2948c621f464bec902b3d80a37aa6d2f9e612..fe45917b885d9c1dba27237b2aee03774c1ea372 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -18,6 +18,9 @@
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
+#define FDT_MODULE                     "apalis-v1.2"
+#define FDT_MODULE_V1_0                        "apalis"
+
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
                                         CONFIG_TDX_CFG_BLOCK_OFFSET)
@@ -58,7 +61,7 @@
        "emmcbootpart=1\0" \
        "emmcdev=0\0" \
        "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
-               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \
+               "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb && " \
                "setenv dtbparam ${fdt_addr_r}\0" \
        "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
        "emmcrootpart=2\0"
@@ -70,7 +73,7 @@
                "run nfsdtbload; dhcp ${kernel_addr_r} " \
                "&& run fdt_fixup && bootz ${kernel_addr_r} - ${dtbparam}\0" \
        "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb " \
+               "${soc}-${fdt_module}-${fdt_board}.dtb " \
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
@@ -85,28 +88,11 @@
        "sdbootpart=1\0" \
        "sddev=1\0" \
        "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
-               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+               "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \
                "&& setenv dtbparam ${fdt_addr_r}\0" \
        "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
        "sdrootpart=2\0"
 
-#define USB_BOOTCMD \
-       "set_usbargs=setenv usbargs ip=off root=PARTUUID=${uuid} ro " \
-               "rootfstype=ext4 rootwait\0" \
-       "usbboot=run setup; usb start; run usbfinduuid; run set_usbargs; " \
-               "setenv bootargs ${defargs} ${setupargs} " \
-               "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
-               "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
-               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
-       "usbbootpart=1\0" \
-       "usbdev=0\0" \
-       "usbdtbload=setenv dtbparam; load usb ${usbdev}:${usbbootpart} " \
-               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0" \
-       "usbfinduuid=part uuid usb ${usbdev}:${usbrootpart} uuid\0" \
-       "usbrootpart=2\0"
-
 #define BOARD_EXTRA_ENV_SETTINGS \
        "boot_file=zImage\0" \
        "console=ttyS0\0" \
@@ -117,9 +103,9 @@
        EMMC_BOOTCMD \
        "fdt_board=eval\0" \
        "fdt_fixup=;\0" \
+       "fdt_module=" FDT_MODULE "\0" \
        NFS_BOOTCMD \
        SD_BOOTCMD \
-       USB_BOOTCMD \
        "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \
                "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \
                "flash_eth.img && source ${loadaddr}\0" \
@@ -136,8 +122,7 @@
        "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \
                "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \
                "source ${loadaddr}\0" \
-       USB_BOOTCMD \
-       "vidargs=video=tegrafb0:640x480-16@60 fbcon=map:1\0"
+       "vidargs=fbcon=map:1\0"
 
 /* Increase console I/O buffer size */
 #undef CONFIG_SYS_CBSIZE
@@ -153,8 +138,6 @@
 
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"