Merge tag 'efi-2019-07-rc5-3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index e6d119e..b4ddd1b 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2017 Toradex, Inc.
  *
  * Configuration settings for the Toradex Apalis TK1 modules.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -15,28 +14,16 @@
 
 #define CONFIG_ARCH_MISC_INIT
 
-/* High-level configuration options */
-#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
-
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-/* I2C */
-#define CONFIG_SYS_I2C_TEGRA
-
-/* SD/MMC support */
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
 /* 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)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 
-/* USB host support */
-#define CONFIG_USB_EHCI_TEGRA
-
 /* PCI host support */
 #undef CONFIG_PCI_SCAN_SHOW
 
@@ -44,8 +31,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
-#define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
 #undef CONFIG_IPADDR
@@ -54,10 +39,6 @@
 #undef CONFIG_SERVERIP
 #define CONFIG_SERVERIP                192.168.10.1
 
-#define CONFIG_BOOTCOMMAND \
-       "run emmcboot; setenv fdtfile ${soc}-apalis-${fdt_board}.dtb && " \
-               "run distro_bootcmd"
-
 #define DFU_ALT_EMMC_INFO      "apalis-tk1.img raw 0x0 0x500 mmcpart 1; " \
                                "boot part 0 1 mmcpart 0; " \
                                "rootfs part 0 2 mmcpart 0; " \
@@ -65,15 +46,22 @@
                                "tegra124-apalis-eval.dtb fat 0 1 mmcpart 0"
 
 #define EMMC_BOOTCMD \
-       "emmcargs=ip=off root=/dev/mmcblk0p2 rw rootfstype=ext3 rootwait\0" \
-       "emmcboot=run setup; setenv bootargs ${defargs} ${emmcargs} " \
-               "${setupargs} ${vidargs}; echo Booting from internal eMMC " \
-               "chip...; run emmcdtbload; load mmc 0:1 ${kernel_addr_r} " \
+       "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
+               "ro rootfstype=ext4 rootwait\0" \
+       "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \
+               "setenv bootargs ${defargs} ${emmcargs} " \
+               "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \
+               "run emmcdtbload; " \
+               "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
                "${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb && " \
-               "setenv dtbparam ${fdt_addr_r}\0"
+       "emmcbootpart=1\0" \
+       "emmcdev=0\0" \
+       "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \
+               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb && " \
+               "setenv dtbparam ${fdt_addr_r}\0" \
+       "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \
+       "emmcrootpart=2\0"
 
 #define NFS_BOOTCMD \
        "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \
@@ -86,26 +74,38 @@
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-       "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext3 rootwait\0" \
-       "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
+       "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro " \
+       "rootfstype=ext4 rootwait\0" \
+       "sdboot=run setup; run sdfinduuid; run set_sdargs; " \
+               "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
                "${vidargs}; echo Booting from SD card in 8bit slot...; " \
-               "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\0"
+       "sdbootpart=1\0" \
+       "sddev=1\0" \
+       "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \
+               "${fdt_addr_r} ${soc}-apalis-${fdt_board}.dtb " \
+               "&& setenv dtbparam ${fdt_addr_r}\0" \
+       "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \
+       "sdrootpart=2\0"
 
 #define USB_BOOTCMD \
-       "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext3 rootwait\0" \
-       "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
+       "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...; " \
-               "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
-               "${boot_file} && run fdt_fixup && " \
+               "run usbdtbload; load usb ${usbdev}:${usbbootpart} " \
+               "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
                "bootm ${kernel_addr_r} - ${dtbparam}\0" \
-       "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \
-               "${soc}-apalis-${fdt_board}.dtb " \
-               "&& setenv dtbparam ${fdt_addr_r}\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=uImage\0" \
@@ -118,6 +118,7 @@
        "fdt_fixup=;\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" \
@@ -151,7 +152,6 @@
 
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SUPPORT_RAW_INITRD
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
 #include "tegra-common-usb-gadget.h"