From: Tom Rini Date: Sun, 18 Dec 2016 18:54:25 +0000 (-0500) Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx X-Git-Tag: v2017.01-rc2~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8ea05705a70135a94419b0d243666c1b51fe1f8d;p=u-boot Merge branch 'master' of git://www.denx.de/git/u-boot-imx Migrate CONFIG_ARCH_USE_MEMSET/MEMCPY with this merge. Signed-off-by: Tom Rini --- 8ea05705a70135a94419b0d243666c1b51fe1f8d diff --cc include/configs/apalis_imx6.h index 0000000000,80a76a8560..d3af2da44f mode 000000,100644..100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@@ -1,0 -1,342 +1,337 @@@ + /* + * Copyright 2013-2015 Toradex, Inc. + * + * Configuration settings for the Toradex Apalis iMX6 + * + * SPDX-License-Identifier: GPL-2.0+ + */ + + #ifndef __CONFIG_H + #define __CONFIG_H + + #include "mx6_common.h" + #define CONFIG_SYS_THUMB_BUILD -/* These are not provided in SPL and result in a linker error */ -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_USE_ARCH_MEMCPY -#define CONFIG_USE_ARCH_MEMSET -#endif + + #undef CONFIG_DISPLAY_BOARDINFO + #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ + + #define CONFIG_MACH_TYPE 4886 + + #define CONFIG_SYS_GENERIC_BOARD + + #include + #include + + #ifdef CONFIG_SPL + #include "imx6_spl.h" + #define CONFIG_SPL_PAD_TO 0x11000 /* 4k IVT/DCD, 64k SPL */ + #endif + + #define CONFIG_CMDLINE_TAG + #define CONFIG_SETUP_MEMORY_TAGS + #define CONFIG_INITRD_TAG + #define CONFIG_REVISION_TAG + #define CONFIG_SERIAL_TAG + + /* Size of malloc() pool */ + #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) + + #define CONFIG_BOARD_EARLY_INIT_F + #define CONFIG_BOARD_LATE_INIT + #define CONFIG_MISC_INIT_R + + #define CONFIG_MXC_UART + #define CONFIG_MXC_UART_BASE UART1_BASE + + /* Make the HW version stuff available in U-Boot env */ + #define CONFIG_VERSION_VARIABLE /* ver environment variable */ + #define CONFIG_ENV_VARS_UBOOT_CONFIG + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + + /* I2C Configs */ + #define CONFIG_SYS_I2C + #define CONFIG_SYS_I2C_MXC + #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ + #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ + #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ + #define CONFIG_SYS_I2C_SPEED 100000 + + /* OCOTP Configs */ + #define CONFIG_CMD_FUSE + #ifdef CONFIG_CMD_FUSE + #define CONFIG_MXC_OCOTP + #endif + + /* MMC Configs */ + #define CONFIG_FSL_ESDHC + #define CONFIG_FSL_USDHC + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_FSL_USDHC_NUM 3 + + #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_BOUNCE_BUFFER + #define CONFIG_FAT_WRITE + #define CONFIG_DOS_PARTITION + + #ifdef CONFIG_MX6Q + #define CONFIG_CMD_SATA + #endif + + /* + * SATA Configs + */ + #ifdef CONFIG_CMD_SATA + #define CONFIG_DWC_AHSATA + #define CONFIG_SYS_SATA_MAX_DEVICE 1 + #define CONFIG_DWC_AHSATA_PORT_ID 0 + #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR + #define CONFIG_LBA48 + #define CONFIG_LIBATA + #endif + + /* Network */ + #define CONFIG_FEC_MXC + #define CONFIG_MII + #define IMX_FEC_BASE ENET_BASE_ADDR + #define CONFIG_FEC_XCV_TYPE RGMII + #define CONFIG_ETHPRIME "FEC" + #define CONFIG_FEC_MXC_PHYADDR 6 + #define CONFIG_PHYLIB + #define CONFIG_PHY_MICREL + #define CONFIG_PHY_MICREL_KSZ9031 + #define CONFIG_IP_DEFRAG + #define CONFIG_TFTP_BLOCKSIZE 4096 + #define CONFIG_TFTP_TSIZE + + /* USB Configs */ + /* Host */ + #define CONFIG_USB_HOST_ETHER + #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 + #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ + #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) + #define CONFIG_MXC_USB_FLAGS 0 + #define CONFIG_USB_KEYBOARD + #ifdef CONFIG_USB_KEYBOARD + #define CONFIG_SYS_USB_EVENT_POLL + #endif /* CONFIG_USB_KEYBOARD */ + /* Client */ + #define CONFIG_USB_GADGET_VBUS_DRAW 2 + #define CONFIG_USBD_HS + + #define CONFIG_USB_GADGET_MASS_STORAGE + #define CONFIG_USB_FUNCTION_MASS_STORAGE + #define CONFIG_G_DNL_MANUFACTURER "Toradex" + /* USB DFU */ + #define CONFIG_DFU_MMC + + /* Miscellaneous commands */ + #define CONFIG_CMD_BMODE + #define CONFIG_MXC_GPIO + + /* Framebuffer and LCD */ + #define CONFIG_VIDEO_IPUV3 + #define CONFIG_SYS_CONSOLE_IS_IN_ENV + #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + #define CONFIG_VIDEO_BMP_RLE8 + #define CONFIG_SPLASH_SCREEN + #define CONFIG_SPLASH_SCREEN_ALIGN + #define CONFIG_BMP_16BPP + #define CONFIG_VIDEO_LOGO + #define CONFIG_VIDEO_BMP_LOGO + #define CONFIG_IPUV3_CLK 260000000 + #define CONFIG_CMD_HDMIDETECT + #define CONFIG_CONSOLE_MUX + #define CONFIG_IMX_HDMI + #define CONFIG_IMX_VIDEO_SKIP + #define CONFIG_CMD_BMP + + /* allow to overwrite serial and ethaddr */ + #define CONFIG_ENV_OVERWRITE + #define CONFIG_CONS_INDEX 1 + #define CONFIG_BAUDRATE 115200 + + /* Command definition */ + #undef CONFIG_CMD_LOADB + #undef CONFIG_CMD_LOADS + #undef CONFIG_CMD_NFS + #undef CONFIG_CMD_FLASH + + #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_LOADADDR 0x12000000 + #define CONFIG_SYS_TEXT_BASE 0x17800000 + + #ifdef CONFIG_CMD_SATA + #define CONFIG_DRIVE_SATA "sata " + #else + #define CONFIG_DRIVE_SATA + #endif + + #ifdef CONFIG_CMD_MMC + #define CONFIG_DRIVE_MMC "mmc " + #else + #define CONFIG_DRIVE_MMC + #endif + + #define CONFIG_DRIVE_TYPES CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC + + #define DFU_ALT_EMMC_INFO \ + "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ + "boot part 0 1;" \ + "rootfs part 0 2;" \ + "uImage fat 0 1;" \ + "imx6q-colibri-eval-v3.dtb fat 0 1;" \ + "imx6q-colibri-cam-eval-v3.dtb fat 0 1" + + #define EMMC_BOOTCMD \ + "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime 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} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define MEM_LAYOUT_ENV_SETTINGS \ + "fdt_addr_r=0x12000000\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "kernel_addr_r=0x11000000\0" \ + "ramdisk_addr_r=0x12100000\0" + + #define NFS_BOOTCMD \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ + "nfsboot=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" \ + "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ + "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ + "rootwait\0" \ + "sdboot=run setup; " \ + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from SD card; " \ + "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ + "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext3 " \ + "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} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 + #define FDT_FILE "imx6q-apalis-eval.dtb" + #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" + #else + #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" + #endif + #define CONFIG_EXTRA_ENV_SETTINGS \ + "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ + "boot_file=uImage\0" \ + "console=ttymxc0\0" \ + "defargs=enable_wait_mode=off vmalloc=400M\0" \ + "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ + EMMC_BOOTCMD \ + "fdt_file=" FDT_FILE "\0" \ + "fdt_fixup=;\0" \ + MEM_LAYOUT_ENV_SETTINGS \ + NFS_BOOTCMD \ + SD_BOOTCMD \ + "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ + "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ + "flash_eth.img && source ${loadaddr}\0" \ + "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \ + "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ + "setup=setenv setupargs fec_mac=${ethaddr} " \ + "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "console=${console},${baudrate}n8\0 " \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ + "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ + "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ + "splashpos=m,m\0" \ + "vidargs=mxc_hdmi.only_cea=1 " \ + "video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24 " \ + "video=mxcfb1:off video=mxcfb2:off video=mxcfb3:off " \ + "fbmem=32M\0 " + + /* Miscellaneous configurable options */ + #define CONFIG_SYS_LONGHELP + #define CONFIG_AUTO_COMPLETE + #undef CONFIG_SYS_CBSIZE + #define CONFIG_SYS_CBSIZE 1024 + #undef CONFIG_SYS_MAXARGS + #define CONFIG_SYS_MAXARGS 48 + + #define CONFIG_SYS_ALT_MEMTEST + #define CONFIG_SYS_MEMTEST_START 0x10000000 + #define CONFIG_SYS_MEMTEST_END 0x10010000 + #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 + + #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + + #define CONFIG_CMDLINE_EDITING + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 + #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + + #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM + #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR + #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + + #define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) + #define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + + /* FLASH and environment organization */ + #define CONFIG_SYS_NO_FLASH + + #define CONFIG_ENV_SIZE (8 * 1024) + + #define CONFIG_ENV_IS_IN_MMC + + #if defined(CONFIG_ENV_IS_IN_MMC) + /* 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 + #endif + + #define CONFIG_OF_SYSTEM_SETUP + + #define CONFIG_CMD_TIME + + #define CONFIG_SUPPORT_RAW_INITRD + + #define CONFIG_CRC32_VERIFY + + #endif /* __CONFIG_H */ diff --cc include/configs/colibri_imx6.h index 0000000000,4ed94fe33a..86ed4d243d mode 000000,100644..100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@@ -1,0 -1,310 +1,305 @@@ + /* + * Copyright 2013-2015 Toradex, Inc. + * + * Configuration settings for the Toradex Colibri iMX6 + * + * SPDX-License-Identifier: GPL-2.0+ + */ + + #ifndef __CONFIG_H + #define __CONFIG_H + + #include "mx6_common.h" + #define CONFIG_SYS_THUMB_BUILD -/* These are not provided in SPL and result in a linker error */ -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_USE_ARCH_MEMCPY -#define CONFIG_USE_ARCH_MEMSET -#endif + + #undef CONFIG_DISPLAY_BOARDINFO + #define CONFIG_DISPLAY_BOARDINFO_LATE /* Calls show_board_info() */ + + #define CONFIG_SYS_GENERIC_BOARD + + #include + #include + + #ifdef CONFIG_SPL + #include "imx6_spl.h" + #define CONFIG_SPL_PAD_TO 0x11000 /* 4k IVT/DCD, 64k SPL */ + #endif + + #define CONFIG_CMDLINE_TAG + #define CONFIG_SETUP_MEMORY_TAGS + #define CONFIG_INITRD_TAG + #define CONFIG_REVISION_TAG + #define CONFIG_SERIAL_TAG + + /* Size of malloc() pool */ + #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) + + #define CONFIG_BOARD_EARLY_INIT_F + #define CONFIG_BOARD_LATE_INIT + #define CONFIG_MISC_INIT_R + + #define CONFIG_MXC_UART + #define CONFIG_MXC_UART_BASE UART1_BASE + + /* Make the HW version stuff available in U-Boot env */ + #define CONFIG_VERSION_VARIABLE /* ver environment variable */ + #define CONFIG_ENV_VARS_UBOOT_CONFIG + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + + /* I2C Configs */ + #define CONFIG_SYS_I2C + #define CONFIG_SYS_I2C_MXC + #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ + #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ + #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ + #define CONFIG_SYS_I2C_SPEED 100000 + + /* OCOTP Configs */ + #define CONFIG_CMD_FUSE + #ifdef CONFIG_CMD_FUSE + #define CONFIG_MXC_OCOTP + #endif + + /* MMC Configs */ + #define CONFIG_FSL_ESDHC + #define CONFIG_FSL_USDHC + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_FSL_USDHC_NUM 2 + + #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_BOUNCE_BUFFER + #define CONFIG_FAT_WRITE + #define CONFIG_DOS_PARTITION + + /* Network */ + #define CONFIG_FEC_MXC + #define CONFIG_MII + #define IMX_FEC_BASE ENET_BASE_ADDR + #define CONFIG_FEC_XCV_TYPE RMII + #define CONFIG_ETHPRIME "FEC" + #define CONFIG_FEC_MXC_PHYADDR 1 + #define CONFIG_PHYLIB + #define CONFIG_PHY_MICREL + #define CONFIG_IP_DEFRAG + #define CONFIG_TFTP_BLOCKSIZE 16352 + #define CONFIG_TFTP_TSIZE + + /* USB Configs */ + /* Host */ + #define CONFIG_USB_HOST_ETHER + #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 + #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ + #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) + #define CONFIG_MXC_USB_FLAGS 0 + #define CONFIG_USB_KEYBOARD + #ifdef CONFIG_USB_KEYBOARD + #define CONFIG_SYS_USB_EVENT_POLL + #endif /* CONFIG_USB_KEYBOARD */ + /* Client */ + #define CONFIG_USB_GADGET_VBUS_DRAW 2 + #define CONFIG_USBD_HS + + #define CONFIG_USB_GADGET_MASS_STORAGE + #define CONFIG_USB_FUNCTION_MASS_STORAGE + #define CONFIG_G_DNL_MANUFACTURER "Toradex" + /* USB DFU */ + #define CONFIG_DFU_MMC + + /* Miscellaneous commands */ + #define CONFIG_CMD_BMODE + #define CONFIG_MXC_GPIO + + /* Framebuffer and LCD */ + #define CONFIG_VIDEO_IPUV3 + #define CONFIG_SYS_CONSOLE_IS_IN_ENV + #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + #define CONFIG_VIDEO_BMP_RLE8 + #define CONFIG_SPLASH_SCREEN + #define CONFIG_SPLASH_SCREEN_ALIGN + #define CONFIG_BMP_16BPP + #define CONFIG_VIDEO_LOGO + #define CONFIG_VIDEO_BMP_LOGO + #define CONFIG_IPUV3_CLK 260000000 + #define CONFIG_CMD_HDMIDETECT + #define CONFIG_CONSOLE_MUX + #define CONFIG_IMX_HDMI + #define CONFIG_IMX_VIDEO_SKIP + #define CONFIG_CMD_BMP + + /* allow to overwrite serial and ethaddr */ + #define CONFIG_ENV_OVERWRITE + #define CONFIG_CONS_INDEX 1 + #define CONFIG_BAUDRATE 115200 + + /* Command definition */ + #undef CONFIG_CMD_LOADB + #undef CONFIG_CMD_LOADS + #undef CONFIG_CMD_NFS + #undef CONFIG_CMD_FLASH + + #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_LOADADDR 0x12000000 + #define CONFIG_SYS_TEXT_BASE 0x17800000 + + #ifdef CONFIG_CMD_MMC + #define CONFIG_DRIVE_MMC "mmc " + #else + #define CONFIG_DRIVE_MMC + #endif + + #define CONFIG_DRIVE_TYPES CONFIG_DRIVE_MMC + + #define DFU_ALT_EMMC_INFO \ + "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ + "boot part 0 1;" \ + "rootfs part 0 2;" \ + "uImage fat 0 1;" \ + "imx6q-colibri-eval-v3.dtb fat 0 1;" \ + "imx6q-colibri-cam-eval-v3.dtb fat 0 1" + + #define EMMC_BOOTCMD \ + "emmcargs=ip=off root=/dev/mmcblk0p2 rw,noatime 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} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "emmcdtbload=setenv dtbparam; load mmc 0:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define MEM_LAYOUT_ENV_SETTINGS \ + "fdt_addr_r=0x12000000\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "kernel_addr_r=0x11000000\0" \ + "ramdisk_addr_r=0x12100000\0" + + #define NFS_BOOTCMD \ + "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ + "nfsboot=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" \ + "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ + "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ + "rootwait\0" \ + "sdboot=run setup; " \ + "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ + "${vidargs}; echo Booting from SD card; " \ + "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ + "usbargs=ip=off root=/dev/sda2 rw,noatime rootfstype=ext3 " \ + "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} " \ + "${boot_file} && run fdt_fixup && " \ + "bootm ${kernel_addr_r} ${dtbparam}\0" \ + "usbdtbload=setenv dtbparam; load usb 0:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" + #define CONFIG_EXTRA_ENV_SETTINGS \ + "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ + "boot_file=uImage\0" \ + "console=ttymxc0\0" \ + "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ + "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ + EMMC_BOOTCMD \ + "fdt_file=" FDT_FILE "\0" \ + "fdt_fixup=;\0" \ + MEM_LAYOUT_ENV_SETTINGS \ + NFS_BOOTCMD \ + SD_BOOTCMD \ + "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ + "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ + "flash_eth.img && source ${loadaddr}\0" \ + "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; load " \ + "${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ + "setup=setenv setupargs fec_mac=${ethaddr} " \ + "consoleblank=0 no_console_suspend=1 console=tty1 " \ + "console=${console},${baudrate}n8\0 " \ + "setupdate=run setsdupdate || run setusbupdate || run setethupdate\0" \ + "setusbupdate=usb start && setenv interface usb; setenv drive 0; " \ + "load ${interface} ${drive}:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ + "splashpos=m,m\0" \ + "vidargs=video=mxcfb0:dev=lcd,640x480M@60,if=RGB666 " \ + "video=mxcfb1:off fbmem=8M\0 " + + /* Miscellaneous configurable options */ + #define CONFIG_SYS_LONGHELP + #define CONFIG_AUTO_COMPLETE + #undef CONFIG_SYS_CBSIZE + #define CONFIG_SYS_CBSIZE 1024 + #undef CONFIG_SYS_MAXARGS + #define CONFIG_SYS_MAXARGS 48 + + #define CONFIG_SYS_ALT_MEMTEST + #define CONFIG_SYS_MEMTEST_START 0x10000000 + #define CONFIG_SYS_MEMTEST_END 0x10010000 + #define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 + + #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + + #define CONFIG_CMDLINE_EDITING + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 + #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + + #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM + #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR + #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + + #define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) + #define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + + /* FLASH and environment organization */ + #define CONFIG_SYS_NO_FLASH + + #define CONFIG_ENV_SIZE (8 * 1024) + + #define CONFIG_ENV_IS_IN_MMC + + #if defined(CONFIG_ENV_IS_IN_MMC) + /* 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 + #endif + + #define CONFIG_OF_SYSTEM_SETUP + + #define CONFIG_CMD_TIME + + #define CONFIG_SUPPORT_RAW_INITRD + + #define CONFIG_CRC32_VERIFY + + #endif /* __CONFIG_H */