From: H. Nikolaus Schaller Date: Sat, 12 Dec 2015 21:57:51 +0000 (+0100) Subject: LC15: fix config and default boot script so that we can use a boot.scr X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7c84a9ec53ecee40fdbba65a8aed8e84147f886;p=pandora-u-boot.git LC15: fix config and default boot script so that we can use a boot.scr Signed-off-by: H. Nikolaus Schaller --- diff --git a/board/goldelico/letux-cortex15/lc15.c b/board/goldelico/letux-cortex15/lc15.c index a28421d60f8..2be6228d52f 100644 --- a/board/goldelico/letux-cortex15/lc15.c +++ b/board/goldelico/letux-cortex15/lc15.c @@ -1,5 +1,6 @@ #include "../../ti/omap5_uevm/evm.c" -// disable tca6424 (because we don't have it on this board) - -// add eMMC/uSD switch logic here (maybe in a way that it is only relevant for MLO) \ No newline at end of file +// add eMMC/uSD switch logic here +// so that we can boot from the internal uSD +// and release the boot button +// (maybe do it in a way that it is only relevant for MLO) diff --git a/board/goldelico/letux-cortex15/lc15.h b/board/goldelico/letux-cortex15/lc15.h deleted file mode 100644 index 826f424d1a1..00000000000 --- a/board/goldelico/letux-cortex15/lc15.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../ti/omap5_uevm/mux_data.h" \ No newline at end of file diff --git a/include/configs/letux_cortex15.h b/include/configs/letux_cortex15.h index 18a2924fd47..ce67030f4c4 100644 --- a/include/configs/letux_cortex15.h +++ b/include/configs/letux_cortex15.h @@ -9,136 +9,50 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_OMAP5_EVM_H -#define __CONFIG_OMAP5_EVM_H +#ifndef __CONFIG_LETUX_CORTEX15_H +#define __CONFIG_LETUX_CORTEX15_H -#ifndef CONFIG_SPL_BUILD -/* Define the default GPT table for eMMC */ -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}" -#endif - -#define DFU_ALT_INFO_MMC \ - "dfu_alt_info_mmc=" \ - "boot part 0 1;" \ - "rootfs part 0 2;" \ - "MLO fat 0 1;" \ - "MLO.raw raw 0x100 0x100;" \ - "u-boot.img.raw raw 0x300 0x400;" \ - "spl-os-args.raw raw 0x80 0x80;" \ - "spl-os-image.raw raw 0x900 0x2000;" \ - "spl-os-args fat 0 1;" \ - "spl-os-image fat 0 1;" \ - "u-boot.img fat 0 1;" \ - "uEnv.txt fat 0 1\0" - -#define DFU_ALT_INFO_EMMC \ - "dfu_alt_info_emmc=" \ - "rawemmc raw 0 3751936;" \ - "boot part 1 1;" \ - "rootfs part 1 2;" \ - "MLO fat 1 1;" \ - "MLO.raw raw 0x100 0x100;" \ - "u-boot.img.raw raw 0x300 0x400;" \ - "spl-os-args.raw raw 0x80 0x80;" \ - "spl-os-image.raw raw 0x900 0x2000;" \ - "spl-os-args fat 1 1;" \ - "spl-os-image fat 1 1;" \ - "u-boot.img fat 1 1;" \ - "uEnv.txt fat 1 1\0" - -#define DFU_ALT_INFO_RAM \ - "dfu_alt_info_ram=" \ - "kernel ram 0x80200000 0x4000000;" \ - "fdt ram 0x80f80000 0x80000;" \ - "ramdisk ram 0x81000000 0x4000000\0" - -#define DFUARGS \ - "dfu_bufsiz=0x10000\0" \ - DFU_ALT_INFO_MMC \ - DFU_ALT_INFO_EMMC \ - DFU_ALT_INFO_RAM - -#include - -#define CONFIG_CONS_INDEX 3 -#define CONFIG_SYS_NS16550_COM3 UART3_BASE -#define CONFIG_BAUDRATE 115200 - -#define CONFIG_MISC_INIT_R -/* MMC ENV related defines */ -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */ -#define CONFIG_ENV_SIZE (128 << 10) -#define CONFIG_ENV_OFFSET 0xE0000 -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT - -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION -#define CONFIG_HSMMC2_8BIT -#define CONFIG_SUPPORT_EMMC_BOOT - -/* Required support for the TCA642X GPIO we have on the uEVM */ -#define CONFIG_TCA642X -#define CONFIG_CMD_TCA642X -#define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 -#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 +#include -/* USB UHH support options */ -#define CONFIG_CMD_USB -#define CONFIG_USB_HOST -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_OMAP -#define CONFIG_USB_STORAGE -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET - -#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80 -#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79 - -/* USB GADGET */ -#define CONFIG_USB_DWC3_PHY_OMAP -#define CONFIG_USB_DWC3_OMAP -#define CONFIG_USB_DWC3 -#define CONFIG_USB_DWC3_GADGET - -#define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" -#define CONFIG_G_DNL_VENDOR_NUM 0x0403 -#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 -#define CONFIG_USB_GADGET_DUALSPEED - -/* USB Device Firmware Update support */ -#define CONFIG_USB_FUNCTION_DFU -#define CONFIG_DFU_RAM -#define CONFIG_CMD_DFU - -#define CONFIG_DFU_MMC - -/* Enabled commands */ -#define CONFIG_CMD_DHCP /* DHCP Support */ - -/* USB Networking options */ -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX +#ifndef CONFIG_SPL_BUILD -#define CONSOLEDEV "ttyO2" +/* Letux Cortex 15 has no tca6424 */ +#undef CONFIG_TCA642X +#undef CONFIG_CMD_TCA642X +#undef CONFIG_SYS_I2C_TCA642X_BUS_NUM +#undef CONFIG_SYS_I2C_TCA642X_ADDR + +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND \ + "echo bootcmd for LC15;" \ + "if test ${dofastboot} -eq 1; then " \ + "echo Boot fastboot requested, resetting dofastboot ...;" \ + "setenv dofastboot 0; saveenv;" \ + "echo Booting into fastboot ...; fastboot;" \ + "fi;" \ + "if run loadbootscript; then " \ + "run bootscript;" \ + "fi;" \ + "echo trying mmc0;" \ + "setenv mmcdev 0; " \ + "setenv bootpart 0:1; " \ + "setenv mmcroot /dev/mmcblk0p2 rw; " \ + "run findfdt; " \ + "run mmcboot;" \ + "echo trying mmc1;" \ + "setenv mmcdev 1; " \ + "setenv bootpart 1:1; " \ + "setenv mmcroot /dev/mmcblk1p2 rw; " \ + "run mmcboot;" \ + "" -/* Max time to hold reset on this board, see doc/README.omap-reset-time */ -#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296 +#endif -#define CONFIG_CMD_SCSI -#define CONFIG_LIBATA -#define CONFIG_SCSI_AHCI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) +if 1 /* for the moment disable environment */ +#undef CONFIG_ENV_IS_IN_MMC +#undef CONFIG_SYS_MMC_ENV_DEV +#undef CONFIG_ENV_SIZE +#undef CONFIG_ENV_OFFSET +#endif -#endif /* __CONFIG_OMAP5_EVM_H */ +#endif /* __CONFIG_LETUX_CORTEX15_H */