Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[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 b4ddd1b..8ca571b 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -18,9 +18,10 @@
 #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)
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 
@@ -42,9 +43,17 @@
 #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; " \
-                               "uImage fat 0 1 mmcpart 0; " \
+                               "zImage fat 0 1 mmcpart 0; " \
                                "tegra124-apalis-eval.dtb fat 0 1 mmcpart 0"
 
+#define UBOOT_UPDATE \
+       "uboot_hwpart=1\0" \
+       "uboot_blk=0\0" \
+       "set_blkcnt=setexpr blkcnt ${filesize} + 0x1ff && " \
+               "setexpr blkcnt ${blkcnt} / 0x200\0" \
+       "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \
+               "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \
+
 #define EMMC_BOOTCMD \
        "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \
                "ro rootfstype=ext4 rootwait\0" \
@@ -54,11 +63,11 @@
                "run emmcdtbload; " \
                "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \
                "${boot_file} && run fdt_fixup && " \
-               "bootm ${kernel_addr_r} - ${dtbparam}\0" \
+               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
        "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"
@@ -68,9 +77,9 @@
        "nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \
                "${setupargs} ${vidargs}; echo Booting via DHCP/TFTP/NFS...; " \
                "run nfsdtbload; dhcp ${kernel_addr_r} " \
-               "&& run fdt_fixup && bootm ${kernel_addr_r} - ${dtbparam}\0" \
+               "&& 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 \
@@ -81,44 +90,29 @@
                "${vidargs}; echo Booting from SD card in 8bit slot...; " \
                "run sddtbload; load mmc ${sddev}:${sdbootpart} " \
                "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \
-               "bootm ${kernel_addr_r} - ${dtbparam}\0" \
+               "bootz ${kernel_addr_r} - ${dtbparam}\0" \
        "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 && " \
-               "bootm ${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=uImage\0" \
+       "boot_file=zImage\0" \
        "console=ttyS0\0" \
        "defargs=lp0_vec=2064@0xf46ff000 core_edp_mv=1150 core_edp_ma=4000 " \
-               "usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0\0" \
+               "usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0 " \
+               "user_debug=30 pcie_aspm=off\0" \
        "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \
        EMMC_BOOTCMD \
        "fdt_board=eval\0" \
        "fdt_fixup=;\0" \
+       "fdt_module=" FDT_MODULE "\0" \
        NFS_BOOTCMD \
        SD_BOOTCMD \
-       USB_BOOTCMD \
+       UBOOT_UPDATE \
        "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" \
@@ -135,8 +129,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
@@ -152,8 +145,6 @@
 
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"