Merge branch 'master' of git://git.denx.de/u-boot-samsung

[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 2c49729..667d084 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
@@ -16,7 +15,6 @@
 #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
@@ -29,7 +27,6 @@
 #define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (-CONFIG_ENV_SIZE + \
                                         CONFIG_TDX_CFG_BLOCK_OFFSET)
 #define CONFIG_SYS_MMC_ENV_DEV         0
@@ -40,7 +37,6 @@
 
 /* PCI host support */
 #undef CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI
 
 /* PCI networking support */
 #define CONFIG_E1000_NO_NVM
@@ -50,19 +46,12 @@
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 
-/* Miscellaneous commands */
-#define CONFIG_FAT_WRITE
-
 #undef CONFIG_IPADDR
 #define CONFIG_IPADDR          192.168.10.2
 #define CONFIG_NETMASK         255.255.255.0
 #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; " \
@@ -91,7 +80,7 @@
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define SD_BOOTCMD \
-       "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext3 rootwait\0" \
+       "sdargs=ip=off root=/dev/mmcblk1p2 rw rootfstype=ext4 rootwait\0" \
        "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${setupargs} " \
                "${vidargs}; echo Booting from SD card in 8bit slot...; " \
                "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \
@@ -102,7 +91,7 @@
                "&& setenv dtbparam ${fdt_addr_r}\0"
 
 #define USB_BOOTCMD \
-       "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext3 rootwait\0" \
+       "usbargs=ip=off root=/dev/sda2 rw rootfstype=ext4 rootwait\0" \
        "usbboot=run setup; setenv bootargs ${defargs} ${setupargs} " \
                "${usbargs} ${vidargs}; echo Booting from USB stick...; " \
                "usb start && run usbdtbload; load usb 0:1 ${kernel_addr_r} " \
@@ -150,16 +139,12 @@
 #undef CONFIG_SYS_BARGSIZE
 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
 
-/* Increase print buffer size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-
 /* Increase maximum number of arguments */
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS             32
 
 #define CONFIG_CMD_TIME
 
-#define CONFIG_SUPPORT_RAW_INITRD
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
 #include "tegra-common-usb-gadget.h"