Merge tag 'v2021.01-rc5' into next
Prepare v2021.01-rc5 Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
149
include/configs/apalis-imx8x.h
Normal file
149
include/configs/apalis-imx8x.h
Normal file
@@ -0,0 +1,149 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright 2020 Toradex
|
||||
*/
|
||||
|
||||
#ifndef __APALIS_IMX8X_H
|
||||
#define __APALIS_IMX8X_H
|
||||
|
||||
#include <asm/arch/imx-regs.h>
|
||||
#include <linux/sizes.h>
|
||||
#include <linux/stringify.h>
|
||||
|
||||
#define CONFIG_REMAKE_ELF
|
||||
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define USDHC1_BASE_ADDR 0x5b010000
|
||||
#define USDHC2_BASE_ADDR 0x5b020000
|
||||
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
|
||||
|
||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||
|
||||
#define CONFIG_TFTP_TSIZE
|
||||
|
||||
#define CONFIG_IPADDR 192.168.10.2
|
||||
#define CONFIG_NETMASK 255.255.255.0
|
||||
#define CONFIG_SERVERIP 192.168.10.1
|
||||
|
||||
#define FEC_ENET_ENABLE_TXC_DELAY
|
||||
#define FEC_ENET_ENABLE_RXC_DELAY
|
||||
|
||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||
"kernel_addr_r=0x80280000\0" \
|
||||
"fdt_addr_r=0x83100000\0" \
|
||||
"ramdisk_addr_r=0x8a000000\0" \
|
||||
"scriptaddr=0x83200000\0"
|
||||
|
||||
#ifdef CONFIG_AHAB_BOOT
|
||||
#define AHAB_ENV "sec_boot=yes\0"
|
||||
#else
|
||||
#define AHAB_ENV "sec_boot=no\0"
|
||||
#endif
|
||||
|
||||
/* Boot M4 */
|
||||
#define M4_BOOT_ENV \
|
||||
"m4_0_image=m4_0.bin\0" \
|
||||
"loadm4image_0=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
|
||||
"${m4_0_image}\0" \
|
||||
"m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
|
||||
|
||||
#define MFG_NAND_PARTITION ""
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(DHCP, dhcp, na)
|
||||
#include <config_distro_bootcmd.h>
|
||||
#undef BOOTENV_RUN_NET_USB_START
|
||||
#define BOOTENV_RUN_NET_USB_START ""
|
||||
|
||||
#define CONFIG_MFG_ENV_SETTINGS \
|
||||
"mfgtool_args=setenv bootargs ${consoleargs} " \
|
||||
"rdinit=/linuxrc g_mass_storage.stall=0 " \
|
||||
"g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
|
||||
"g_mass_storage.idProduct=0x37FF " \
|
||||
"g_mass_storage.iSerialNumber=\"\" " MFG_NAND_PARTITION \
|
||||
"${vidargs} clk_ignore_unused\0" \
|
||||
"initrd_addr=0x83800000\0" \
|
||||
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} " \
|
||||
"${fdt_addr};\0" \
|
||||
|
||||
/* Initial environment variables */
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
AHAB_ENV \
|
||||
BOOTENV \
|
||||
CONFIG_MFG_ENV_SETTINGS \
|
||||
M4_BOOT_ENV \
|
||||
MEM_LAYOUT_ENV_SETTINGS \
|
||||
"boot_file=Image\0" \
|
||||
"consoleargs=console=ttyLP3,${baudrate} earlycon\0" \
|
||||
"fdt_file=imx8qxp-apalis-eval.dtb\0" \
|
||||
"fdtfile=imx8qxp-apalis-eval.dtb\0" \
|
||||
"finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
|
||||
"image=Image\0" \
|
||||
"initrd_addr=0x83800000\0" \
|
||||
"mmcargs=setenv bootargs ${consoleargs} " \
|
||||
"root=PARTUUID=${uuid} rootwait " \
|
||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
|
||||
"netargs=setenv bootargs ${consoleargs} " \
|
||||
"root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
|
||||
"${vidargs}\0" \
|
||||
"nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
|
||||
"apalis-imx8x/${fdt_file}; booti ${loadaddr} - " \
|
||||
"${fdt_addr}\0" \
|
||||
"panel=NULL\0" \
|
||||
"script=boot.scr\0" \
|
||||
"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
|
||||
"if test \"$confirm\" = \"y\"; then " \
|
||||
"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
|
||||
"${blkcnt} / 0x200; mmc dev 0 1; mmc write ${loadaddr} 0x0 " \
|
||||
"${blkcnt}; fi\0" \
|
||||
"vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
|
||||
|
||||
/* Link Definitions */
|
||||
#define CONFIG_LOADADDR 0x89000000
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR 0x80200000
|
||||
|
||||
/* Environment in eMMC, before config block at the end of 1st "boot sector" */
|
||||
|
||||
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
|
||||
|
||||
/* On Apalis iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||
|
||||
#define CONFIG_SYS_BOOTM_LEN SZ_64M /* Increase max gunzip size */
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024)
|
||||
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x80000000
|
||||
#define PHYS_SDRAM_1 0x80000000
|
||||
#define PHYS_SDRAM_2 0x880000000
|
||||
#define PHYS_SDRAM_1_SIZE SZ_2G /* 2 GB */
|
||||
#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 GB */
|
||||
|
||||
/* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
|
||||
#define CONFIG_SYS_CBSIZE SZ_2K
|
||||
#define CONFIG_SYS_MAXARGS 64
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
|
||||
sizeof(CONFIG_SYS_PROMPT) + 16)
|
||||
|
||||
/* Generic Timer Definitions */
|
||||
#define COUNTER_FREQUENCY 8000000 /* 8MHz */
|
||||
|
||||
/* Networking */
|
||||
#define CONFIG_FEC_ENET_DEV 0
|
||||
#define IMX_FEC_BASE 0x5b040000
|
||||
#define CONFIG_FEC_MXC_PHYADDR 0x4
|
||||
#define CONFIG_ETHPRIME "eth0"
|
||||
#define CONFIG_FEC_XCV_TYPE RGMII
|
||||
#define FEC_QUIRK_ENET_MAC
|
||||
#define PHY_ANEG_TIMEOUT 20000
|
||||
|
||||
#endif /* __APALIS_IMX8X_H */
|
||||
@@ -12,7 +12,14 @@
|
||||
|
||||
#include "tegra30-common.h"
|
||||
|
||||
/* Board-specific serial config */
|
||||
/*
|
||||
* Board-specific serial config
|
||||
*
|
||||
* Apalis UART1: NVIDIA UARTA
|
||||
* Apalis UART2: NVIDIA UARTD
|
||||
* Apalis UART3: NVIDIA UARTB
|
||||
* Apalis UART4: NVIDIA UARTC
|
||||
*/
|
||||
#define CONFIG_TEGRA_ENABLE_UARTA
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
|
||||
|
||||
|
||||
@@ -13,14 +13,18 @@
|
||||
|
||||
#define CONFIG_HOSTNAME "aristainetos2"
|
||||
|
||||
#if (CONFIG_SYS_BOARD_VERSION == 5)
|
||||
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||||
#define CONSOLE_DEV "ttymxc1"
|
||||
#elif (CONFIG_SYS_BOARD_VERSION == 6)
|
||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||
#define CONSOLE_DEV "ttymxc0"
|
||||
#endif
|
||||
|
||||
#define CONFIG_FEC_XCV_TYPE RGMII
|
||||
|
||||
/* Framebuffer */
|
||||
#define CONFIG_SYS_LDB_CLOCK 28341000
|
||||
#define CONFIG_LG4573
|
||||
|
||||
#include "mx6_common.h"
|
||||
|
||||
@@ -77,6 +81,8 @@
|
||||
"enable_hab_check=1\0"
|
||||
#else
|
||||
#define HAB_EXTRA_SETTINGS \
|
||||
"hab_check_addr=echo HAB check addr always returns " \
|
||||
"true;true\0" \
|
||||
"hab_check_file_fit=echo HAB check FIT file always returns " \
|
||||
"true;true\0" \
|
||||
"hab_check_flash_fit=echo HAB check flash FIT always returns " \
|
||||
@@ -86,96 +92,18 @@
|
||||
"enable_hab_check=0\0"
|
||||
#endif
|
||||
|
||||
#if (CONFIG_SYS_BOARD_VERSION == 3)
|
||||
#if (CONFIG_SYS_BOARD_VERSION == 5)
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"dead=led led_red on\0" \
|
||||
"mtdids=nand0=gpmi-nand,nor0=spi0.0\0" \
|
||||
"mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
|
||||
"-(ubi-nor);gpmi-nand:-(ubi)\0" \
|
||||
"addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0 " \
|
||||
"bootmode=${bootmode} mmcpart=${mmcpart}\0" \
|
||||
"mainboot=echo Booting from SD-card ...; " \
|
||||
"run mainargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mainargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${mmcroot}\0" \
|
||||
"main_load_fit=ext4load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}\0" \
|
||||
"rescue_load_fit=ext4load mmc ${mmcdev}:${mmcrescuepart} " \
|
||||
"${fit_addr_r} ${rescue_fit_file}\0"
|
||||
#elif (CONFIG_SYS_BOARD_VERSION == 4)
|
||||
"dead=while true; do; " \
|
||||
"led led_red on; sleep 1;" \
|
||||
"led led_red off; sleep 1;" \
|
||||
"done\0"
|
||||
#elif (CONFIG_SYS_BOARD_VERSION == 6)
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"dead=led led_red on;led led_red2 on;\0" \
|
||||
"mtdids=nand0=gpmi-nand,nor0=spi0.0\0" \
|
||||
"mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
|
||||
"-(ubi-nor);gpmi-nand:-(ubi)\0" \
|
||||
"addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0 " \
|
||||
"bootmode=${bootmode} mmcpart=${mmcpart}\0" \
|
||||
"mainboot=echo Booting from SD-card ...; " \
|
||||
"run mainargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mainargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${mmcroot}\0" \
|
||||
"main_load_fit=ext4load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}\0" \
|
||||
"rescue_load_fit=ext4load mmc ${mmcdev}:${mmcrescuepart} " \
|
||||
"${fit_addr_r} ${rescue_fit_file}\0"
|
||||
#elif (CONFIG_SYS_BOARD_VERSION == 5)
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"emmcpart=1\0" \
|
||||
"emmc_rescue_part=3\0" \
|
||||
"emmcdev=1\0" \
|
||||
"emmcroot=/dev/mmcblk1p1 rootwait rw\0" \
|
||||
"dead=led led_red on\0" \
|
||||
"mtdids=nor0=spi0.0\0" \
|
||||
"mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
|
||||
"-(ubi-nor)\0" \
|
||||
"addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0 " \
|
||||
"bootmode=${bootmode} mmcpart=${mmcpart} " \
|
||||
"emmcpart=${emmcpart}\0" \
|
||||
"mainboot=echo Booting from eMMC ...; " \
|
||||
"run mainargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mainargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${emmcroot} rootfstype=ext4\0 " \
|
||||
"main_load_fit=ext4load mmc ${emmcdev}:${emmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}; " \
|
||||
"imi ${fit_addr_r}\0 " \
|
||||
"rescue_load_fit=ext4load mmc ${emmcdev}:${emmc_rescue_part} " \
|
||||
"${fit_addr_r} ${rescue_fit_file};imi ${fit_addr_r}\0"
|
||||
#else
|
||||
#define CONFIG_EXTRA_ENV_BOARD_SETTINGS \
|
||||
"dead=led led_red on\0" \
|
||||
"mtdids=nand0=gpmi-nand,nor0=spi3.1\0" \
|
||||
"mtdparts=mtdparts=spi3.1:832k(u-boot),64k(env),64k(env-red)," \
|
||||
"-(ubi-nor);gpmi-nand:-(ubi)\0" \
|
||||
"addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0 " \
|
||||
"bootmode=${bootmode} mmcpart=${mmcpart}\0" \
|
||||
"mainboot=echo Booting from SD-card ...; " \
|
||||
"run mainargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mainargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${mmcroot}\0" \
|
||||
"main_load_fit=ext4load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}\0" \
|
||||
"rescue_load_fit=ext4load mmc ${mmcdev}:${mmcrescuepart} " \
|
||||
"${fit_addr_r} ${rescue_fit_file}\0"
|
||||
"dead=while true; do; " \
|
||||
"led led_red on; led led_red2 on; sleep 1;" \
|
||||
"led led_red off; led led_red2 off;; sleep 1;" \
|
||||
"done\0"
|
||||
#endif
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
@@ -183,17 +111,24 @@
|
||||
"usb_pgood_delay=2000\0" \
|
||||
"nor_bootdelay=-2\0" \
|
||||
"script=u-boot.scr\0" \
|
||||
"fit_file=/boot/system.itb\0" \
|
||||
"rescue_fit_file=/boot/rescue.itb\0" \
|
||||
"loadaddr=0x12000000\0" \
|
||||
"fit_addr_r=0x14000000\0" \
|
||||
"uboot=/boot/u-boot.imx\0" \
|
||||
"uboot_sz=d0000\0" \
|
||||
"panel=lb07wv8\0" \
|
||||
"splashpos=m,m\0" \
|
||||
"console=" CONSOLE_DEV "\0" \
|
||||
"fdt_high=0xffffffff\0" \
|
||||
"initrd_high=0xffffffff\0" \
|
||||
"emmcroot=/dev/mmcblk1p1 rootwait rw\0" \
|
||||
"mtdids=nor0=spi0.0\0" \
|
||||
"mtdparts=mtdparts=spi0.0:832k(u-boot),64k(env),64k(env-red)," \
|
||||
"-(ubi-nor)\0" \
|
||||
"mk_fitfile_path=setenv fit_file /${sysnum}/system.itb\0" \
|
||||
"mk_rescue_fitfile_path=setenv rescue_fit_file /${rescue_sysnum}/system.itb\0" \
|
||||
"mk_uboot_path=setenv uboot /${sysnum}/u-boot.imx\0" \
|
||||
"mk_pubkey_path=setenv pubkey /${sysnum}/PCR.pem\0" \
|
||||
"mk_rescue_pubkey_path=setenv pubkey /${rescue_sysnum}/PCR.pem\0" \
|
||||
"addmisc=setenv bootargs ${bootargs} net.ifnames=0 consoleblank=0 " \
|
||||
"bootmode=${bootmode} rng_core.default_quality=1000 " \
|
||||
"mmcpart=${mmcpart} emmcpart=${emmcpart} sysnum=${sysnum}\0" \
|
||||
"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
|
||||
"boot_board_type=bootm ${fit_addr_r}#${board_type}\0" \
|
||||
"get_env=mw ${loadaddr} 0 0x20000;" \
|
||||
@@ -205,7 +140,7 @@
|
||||
"sf protect unlock 0 0x1000000;" \
|
||||
"mw ${loadaddr} 0 0x20000;" \
|
||||
"env export -t ${loadaddr} serial# ethaddr " \
|
||||
"board_type panel addmisc addmiscM addmiscC addmiscD;" \
|
||||
"board_type panel;" \
|
||||
"env default -a;" \
|
||||
"env import -t ${loadaddr}\0" \
|
||||
"loadbootscript=" \
|
||||
@@ -216,28 +151,62 @@
|
||||
"loadbootscriptUSBf=" \
|
||||
"fatload usb 0 ${loadaddr} ${script};\0" \
|
||||
"bootscriptUSB=echo Running bootscript from usb-stick ...; " \
|
||||
"source\0" \
|
||||
"source \0" \
|
||||
"bootscript=echo Running bootscript from mmc ...; " \
|
||||
"source\0" \
|
||||
"source \0" \
|
||||
"mmcpart=1\0" \
|
||||
"mmcrescuepart=3\0" \
|
||||
"mmcdev=0\0" \
|
||||
"emmcpart=1\0" \
|
||||
"emmcdev=1\0" \
|
||||
"sysnum=1\0" \
|
||||
"rescue_sysnum=0\0" \
|
||||
"rreason=18\0" \
|
||||
"mainboot=echo Booting from eMMC ...; " \
|
||||
"run mainargs addmtd addmisc;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mainargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${emmcroot} rootfstype=ext4\0 " \
|
||||
"main_load_fit=run mk_fitfile_path; " \
|
||||
"ext4load mmc ${emmcdev}:${emmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}; " \
|
||||
"imi ${fit_addr_r}\0 " \
|
||||
"rescue_load_fit=run mk_rescue_fitfile_path; " \
|
||||
"ext4load mmc ${emmcdev}:${emmcpart} ${fit_addr_r} " \
|
||||
"${rescue_fit_file}; " \
|
||||
"imi ${fit_addr_r}\0" \
|
||||
"main_load_pubkey=run mk_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load mmc ${emmcdev}:${emmcpart} ${loadaddr} " \
|
||||
"${pubkey}\0" \
|
||||
"rescue_load_pubkey=run mk_rescue_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load mmc ${emmcdev}:${emmcpart} ${loadaddr} " \
|
||||
"${pubkey}\0" \
|
||||
"mainRargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"rescue_sysnum=${rescue_sysnum} root=${emmcroot} rootfstype=ext4\0" \
|
||||
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${mmcroot}\0" \
|
||||
"mmcRargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"rescue_sysnum=${rescue_sysnum} root=${mmcroot}\0" \
|
||||
"mmcboot=echo Booting from mmc ...; " \
|
||||
"run mmcargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"mmc_load_fit=ext4load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
|
||||
"mmc_load_fit=run mk_fitfile_path; " \
|
||||
"ext4load mmc ${mmcdev}:${mmcpart} ${fit_addr_r} " \
|
||||
"${fit_file}\0" \
|
||||
"mmc_load_uboot=ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
|
||||
"${uboot}\0" \
|
||||
"mmc_rescue_load_fit=ext4load mmc ${mmcdev}:${mmcrescuepart} " \
|
||||
"imi ${fit_addr_r}\0" \
|
||||
"mmc_rescue_load_fit=run mk_rescue_fitfile_path; " \
|
||||
"ext4load mmc ${mmcdev}:${mmcpart} " \
|
||||
"${fit_addr_r} ${rescue_fit_file}\0" \
|
||||
"imi ${fit_addr_r}\0" \
|
||||
"mmc_load_uboot=run mk_uboot_path; " \
|
||||
"ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
|
||||
"${uboot}\0" \
|
||||
"mmc_upd_uboot=mw.b ${loadaddr} 0xff ${uboot_sz};" \
|
||||
"setexpr cmp_buf ${loadaddr} + ${uboot_sz};" \
|
||||
"setexpr uboot_maxsize ${uboot_sz} - 400;" \
|
||||
@@ -246,14 +215,19 @@
|
||||
"sf write ${loadaddr} 400 ${filesize};" \
|
||||
"sf read ${cmp_buf} 400 ${uboot_sz};" \
|
||||
"cmp.b ${loadaddr} ${cmp_buf} ${uboot_maxsize}\0" \
|
||||
"rescueargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=/dev/ram rw\0 " \
|
||||
"mmc_load_pubkey=run mk_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
|
||||
"${pubkey}\0" \
|
||||
"mmc_rescue_load_pubkey=run mk_rescue_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \
|
||||
"${pubkey}\0" \
|
||||
"rescueboot=echo Booting rescue system ...; " \
|
||||
"run rescueargs addmtd addmisc;" \
|
||||
"run addmtd addmisc;" \
|
||||
"if test -n ${rescue_reason}; then run rescue_reason;fi;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"if bootm ${fit_addr_r}; then ; " \
|
||||
"else " \
|
||||
@@ -261,50 +235,73 @@
|
||||
"fi; \0" \
|
||||
"r_reason_syserr=setenv rescue_reason setenv bootargs " \
|
||||
"\\\\${bootargs} " \
|
||||
"rescueReason=18\0 " \
|
||||
"usb_load_fit=ext4load usb 0 ${fit_addr_r} ${fit_file}\0" \
|
||||
"usb_load_fitf=fatload usb 0 ${fit_addr_r} ${fit_file}\0" \
|
||||
"usb_load_rescuefit=ext4load usb 0 ${fit_addr_r} " \
|
||||
"rescueReason=$rreason\0 " \
|
||||
"usb_load_fit=run mk_fitfile_path; " \
|
||||
"ext4load usb 0 ${fit_addr_r} ${fit_file}\0" \
|
||||
"usb_load_fitf=run mk_fitfile_path; " \
|
||||
"fatload usb 0 ${fit_addr_r} ${fit_file}\0" \
|
||||
"usb_load_rescuefit=run mk_rescue_fitfile_path; " \
|
||||
"ext4load usb 0 ${fit_addr_r} " \
|
||||
"${rescue_fit_file}\0" \
|
||||
"usb_load_rescuefitf=fatload usb 0 ${fit_addr_r} " \
|
||||
"usb_load_rescuefitf=run mk_rescue_fitfile_path; " \
|
||||
"fatload usb 0 ${fit_addr_r} " \
|
||||
"${rescue_fit_file}\0" \
|
||||
"usb_load_pubkey=run mk_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load usb 0 ${loadaddr} ${pubkey}\0" \
|
||||
"usb_rescue_load_pubkey=run mk_rescue_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"ext4load usb 0 ${loadaddr} ${pubkey}\0" \
|
||||
"usb_load_pubkeyf=run mk_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"fatload usb 0 ${loadaddr} ${pubkey}\0" \
|
||||
"usb_rescue_load_pubkeyf=run mk_rescue_pubkey_path; " \
|
||||
"setenv hab_check_filetype \"PCR.pem\";" \
|
||||
"env set check_addr ${loadaddr};" \
|
||||
"fatload usb 0 ${loadaddr} ${pubkey}\0" \
|
||||
"usbroot=/dev/sda1 rootwait rw\0" \
|
||||
"usbboot=echo Booting from usb-stick ...; " \
|
||||
"run usbargs addmtd addmisc;" \
|
||||
"if test -n ${addmiscM}; then run addmiscM;fi;" \
|
||||
"if test -n ${addmiscC}; then run addmiscC;fi;" \
|
||||
"if test -n ${addmiscD}; then run addmiscD;fi;" \
|
||||
"run boot_board_type;" \
|
||||
"bootm ${fit_addr_r}\0" \
|
||||
"usbargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"root=${usbroot}\0" \
|
||||
"usbRargs=setenv bootargs console=${console},${baudrate} " \
|
||||
"rescue_sysnum=${rescue_sysnum} root=${usbroot} rw\0 " \
|
||||
"mmc_rescue_boot=" \
|
||||
"run r_reason_syserr;" \
|
||||
"if run mmc_rescue_load_fit hab_check_file_fit; then " \
|
||||
"run rescueboot; " \
|
||||
"if run mmc_rescue_load_pubkey hab_check_addr " \
|
||||
"mmc_rescue_load_fit hab_check_file_fit; then " \
|
||||
"run mmcRargs; run rescueboot; " \
|
||||
"else " \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM FROM SD-CARD BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"fi;\0" \
|
||||
"main_rescue_boot=" \
|
||||
"if run main_load_fit hab_check_flash_fit; then " \
|
||||
"if run main_load_pubkey hab_check_addr " \
|
||||
"main_load_fit hab_check_flash_fit; then " \
|
||||
"if run mainboot; then ; " \
|
||||
"else " \
|
||||
"run r_reason_syserr;" \
|
||||
"if run rescue_load_fit hab_check_file_fit;" \
|
||||
"then run rescueboot; " \
|
||||
"if run rescue_load_pubkey hab_check_addr " \
|
||||
"rescue_load_fit hab_check_file_fit; then " \
|
||||
"run mainRargs; run rescueboot; " \
|
||||
"else " \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"fi; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"run r_reason_syserr;" \
|
||||
"if run rescue_load_fit hab_check_file_fit; then " \
|
||||
"run rescueboot; " \
|
||||
"if run rescue_load_pubkey hab_check_addr " \
|
||||
"rescue_load_fit hab_check_file_fit; then " \
|
||||
"run mainRargs; run rescueboot; " \
|
||||
"else " \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"fi; " \
|
||||
"fi;\0" \
|
||||
"usb_mmc_rescue_boot=" \
|
||||
@@ -318,17 +315,21 @@
|
||||
"hab_check_file_bootscript;" \
|
||||
"then run bootscriptUSB; " \
|
||||
"fi; " \
|
||||
"if run usb_load_fit hab_check_file_fit; then " \
|
||||
"if run usb_load_pubkey hab_check_addr " \
|
||||
"usb_load_fit hab_check_file_fit; then " \
|
||||
"run usbboot; " \
|
||||
"fi; " \
|
||||
"if run usb_load_fitf hab_check_file_fit; then " \
|
||||
"if run usb_load_pubkeyf hab_check_addr " \
|
||||
"usb_load_fitf hab_check_file_fit; then " \
|
||||
"run usbboot; " \
|
||||
"fi; "\
|
||||
"if run usb_load_rescuefit hab_check_file_fit;" \
|
||||
"then run r_reason_syserr rescueboot;" \
|
||||
"if run usb_rescue_load_pubkey hab_check_addr " \
|
||||
"usb_load_rescuefit hab_check_file_fit; then " \
|
||||
"run r_reason_syserr usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"if run usb_load_rescuefitf hab_check_file_fit;" \
|
||||
"then run r_reason_syserr rescueboot;" \
|
||||
"if run usb_rescue_load_pubkeyf hab_check_addr " \
|
||||
"usb_load_rescuefitf hab_check_file_fit; then " \
|
||||
"run r_reason_syserr usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"run mmc_rescue_boot;" \
|
||||
"fi; "\
|
||||
@@ -338,48 +339,57 @@
|
||||
"if test ${bootmode} -ne 0 ; then " \
|
||||
"mmc dev ${mmcdev};" \
|
||||
"if mmc rescan; then " \
|
||||
"if run mmc_rescue_load_fit " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run rescueboot; " \
|
||||
"if run mmc_rescue_load_pubkey " \
|
||||
"hab_check_addr " \
|
||||
"mmc_rescue_load_fit " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run mmcRargs; run rescueboot; " \
|
||||
"else " \
|
||||
"usb start;" \
|
||||
"if usb storage; then " \
|
||||
"if run usb_load_rescuefit " \
|
||||
"hab_check_file_fit;"\
|
||||
"then " \
|
||||
"run rescueboot;" \
|
||||
"if run usb_rescue_load_pubkey " \
|
||||
"hab_check_addr " \
|
||||
"usb_load_rescuefit " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"if run usb_load_rescuefitf "\
|
||||
"hab_check_file_fit;"\
|
||||
"then " \
|
||||
"run rescueboot;" \
|
||||
"if run usb_rescue_load_pubkeyf " \
|
||||
"hab_check_addr " \
|
||||
"usb_load_rescuefitf " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"fi;" \
|
||||
"fi;" \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM ON SD OR " \
|
||||
"USB BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"else " \
|
||||
"usb start;" \
|
||||
"if usb storage; then " \
|
||||
"if run usb_load_rescuefit " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run rescueboot;" \
|
||||
"if run usb_rescue_load_pubkey " \
|
||||
"hab_check_addr " \
|
||||
"usb_load_rescuefit " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"if run usb_load_rescuefitf " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run rescueboot;" \
|
||||
"if run usb_rescue_load_pubkeyf " \
|
||||
"hab_check_addr " \
|
||||
"usb_load_rescuefitf " \
|
||||
"hab_check_file_fit; then " \
|
||||
"run usbRargs; run rescueboot;" \
|
||||
"fi; " \
|
||||
"fi;" \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM ON USB BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"fi; " \
|
||||
"else "\
|
||||
"if run rescue_load_fit hab_check_file_fit; then " \
|
||||
"run rescueboot; " \
|
||||
"if run rescue_load_pubkey hab_check_addr " \
|
||||
"rescue_load_fit hab_check_file_fit; then " \
|
||||
"run mainRargs; run rescueboot; " \
|
||||
"else " \
|
||||
"run dead; " \
|
||||
"echo RESCUE SYSTEM ON BOARD BOOT FAILURE;" \
|
||||
"run dead; " \
|
||||
"fi; " \
|
||||
"fi;\0" \
|
||||
"ari_boot=if test ${bootmode} -ne 0 ; then " \
|
||||
@@ -388,7 +398,8 @@
|
||||
"if run loadbootscript hab_check_file_bootscript;" \
|
||||
"then run bootscript; " \
|
||||
"fi; " \
|
||||
"if run mmc_load_fit hab_check_file_fit; then " \
|
||||
"if run mmc_load_pubkey hab_check_addr " \
|
||||
"mmc_load_fit hab_check_file_fit; then " \
|
||||
"if run mmcboot; then ; " \
|
||||
"else " \
|
||||
"run mmc_rescue_boot;" \
|
||||
@@ -421,12 +432,6 @@
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||
|
||||
/* NAND stuff */
|
||||
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
||||
#define CONFIG_SYS_NAND_BASE 0x40000000
|
||||
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
|
||||
#define CONFIG_SYS_NAND_ONFI_DETECTION
|
||||
|
||||
/* DMA stuff, needed for GPMI/MXS NAND support */
|
||||
|
||||
/* USB Configs */
|
||||
@@ -444,4 +449,7 @@
|
||||
|
||||
#define CONFIG_IMX6_PWM_PER_CLK 66000000
|
||||
|
||||
#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
|
||||
"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"
|
||||
|
||||
#endif /* __ARISTAINETOS2_CONFIG_H */
|
||||
|
||||
@@ -28,8 +28,6 @@
|
||||
#include "tegra-common-usb-gadget.h"
|
||||
#include "tegra-common-post.h"
|
||||
|
||||
#define CONFIG_ARMV7_PSCI 1
|
||||
#define CONFIG_ARMV7_PSCI_NR_CPUS 4
|
||||
/* Reserve top 1M for secure RAM */
|
||||
#define CONFIG_ARMV7_SECURE_BASE 0xfff00000
|
||||
#define CONFIG_ARMV7_SECURE_RESERVE_SIZE 0x00100000
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#define CONFIG_SPI_FLASH_SST
|
||||
|
||||
/* Thermal support */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* I2C Configs */
|
||||
#define CONFIG_SYS_I2C
|
||||
|
||||
@@ -15,10 +15,13 @@
|
||||
"read mmc 2:2 100000 0 80; setexpr loader *001004f0; " \
|
||||
"setexpr size *00100518; setexpr blocks $size / 200; " \
|
||||
"read mmc 2:2 100000 80 $blocks; setexpr setup $loader - 1000; " \
|
||||
"setexpr cmdline $loader - 2000; " \
|
||||
"part uuid mmc 2:2 uuid; setenv bootargs_U $uuid; " \
|
||||
"zboot start 100000 0 0 0 $setup $cmdline; " \
|
||||
"zboot load; zboot setup; zboot dump; zboot go"
|
||||
"setexpr cmdline_ptr $loader - 2000; " \
|
||||
"setexpr.s cmdline *$cmdline_ptr; " \
|
||||
"setexpr cmdline gsub %U \\\\${uuid}; " \
|
||||
"if part uuid mmc 2:2 uuid; then " \
|
||||
"zboot start 100000 0 0 0 $setup cmdline; " \
|
||||
"zboot load; zboot setup; zboot dump; zboot go;" \
|
||||
"fi"
|
||||
|
||||
#include <configs/x86-common.h>
|
||||
#include <configs/x86-chromebook.h>
|
||||
|
||||
@@ -141,9 +141,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
/* Uncomment to enable iMX thermal driver support */
|
||||
/*#define CONFIG_IMX_THERMAL*/
|
||||
|
||||
/* SPL */
|
||||
#include "imx7_spl.h"
|
||||
|
||||
|
||||
@@ -150,13 +150,6 @@
|
||||
/* APBH DMA is required for NAND support */
|
||||
#endif
|
||||
|
||||
/* SPI Flash Configs */
|
||||
#if defined(CONFIG_SPL_BUILD)
|
||||
#undef CONFIG_DM_SPI
|
||||
#undef CONFIG_DM_SPI_FLASH
|
||||
#undef CONFIG_SPI_FLASH_MTD
|
||||
#endif
|
||||
|
||||
/* Ethernet */
|
||||
#define CONFIG_FEC_MXC
|
||||
#define CONFIG_FEC_MXC_PHYADDR 0
|
||||
|
||||
@@ -140,8 +140,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_USBD_HS
|
||||
|
||||
/* USB Device Firmware Update support */
|
||||
|
||||
@@ -208,8 +208,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_USBD_HS
|
||||
|
||||
#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
|
||||
|
||||
@@ -14,7 +14,13 @@
|
||||
|
||||
/* High-level configuration options */
|
||||
|
||||
/* Board-specific serial config */
|
||||
/*
|
||||
* Board-specific serial config
|
||||
*
|
||||
* Colibri UART-A: NVIDIA UARTA
|
||||
* Colibri UART-B: NVIDIA UARTD
|
||||
* Colibri UART-C: NVIDIA UARTB
|
||||
*/
|
||||
#define CONFIG_TEGRA_ENABLE_UARTA
|
||||
#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE
|
||||
|
||||
|
||||
@@ -84,8 +84,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define ENV_MMC \
|
||||
"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
|
||||
"mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \
|
||||
|
||||
@@ -52,12 +52,6 @@
|
||||
/* SATA Configs */
|
||||
#define CONFIG_LBA48
|
||||
|
||||
/* SPI Flash Configs */
|
||||
#if defined(CONFIG_SPL_BUILD)
|
||||
#undef CONFIG_DM_SPI
|
||||
#undef CONFIG_DM_SPI_FLASH
|
||||
#endif
|
||||
|
||||
/* UART */
|
||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
|
||||
#include "mx6_common.h"
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
|
||||
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
||||
|
||||
|
||||
@@ -62,7 +62,6 @@
|
||||
|
||||
/* JFFS2 */
|
||||
#ifdef CONFIG_CMD_JFFS2
|
||||
#define CONFIG_JFFS2_CMDLINE
|
||||
#define CONFIG_JFFS2_NAND
|
||||
#endif
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
#define CONFIG_LOADADDR 0x12000000
|
||||
|
||||
#ifdef CONFIG_NFS_CMD
|
||||
#ifdef CONFIG_CMD_NFS
|
||||
#define NETWORKBOOT \
|
||||
"setnetworkboot=" \
|
||||
"setenv ipaddr 172.16.2.10; setenv serverip 172.16.2.20; " \
|
||||
@@ -56,13 +56,13 @@
|
||||
"setenv netmask 255.255.255.0; setenv ethaddr ca:fe:de:ca:f0:11; " \
|
||||
"setenv bootargs root=/dev/nfs nfsroot=${nfsserver}:/srv/nfs/,v3,tcp rw rootwait" \
|
||||
"setenv bootargs $bootargs ip=${ipaddr}:${nfsserver}:${gatewayip}:${netmask}::eth0:off " \
|
||||
"setenv bootargs $bootargs cma=128M bootcause=POR ${videoargs} " \
|
||||
"setenv bootargs $bootargs cma=128M bootcause=${bootcause} ${videoargs} " \
|
||||
"setenv bootargs $bootargs systemd.mask=helix-network-defaults.service " \
|
||||
"setenv bootargs $bootargs watchdog.handle_boot_enabled=1\0" \
|
||||
"networkboot=" \
|
||||
"run setnetworkboot; " \
|
||||
"nfs ${loadaddr} /srv/nfs/fitImage; " \
|
||||
"bootm ${loadaddr}#conf@${confidx}\0" \
|
||||
"bootm ${loadaddr}\0" \
|
||||
|
||||
#define CONFIG_NETWORKBOOTCOMMAND \
|
||||
"run networkboot; " \
|
||||
@@ -74,7 +74,6 @@
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
NETWORKBOOT \
|
||||
"bootcause=POR\0" \
|
||||
"image=/boot/fitImage\0" \
|
||||
"dev=mmc\0" \
|
||||
"devnum=2\0" \
|
||||
@@ -104,7 +103,6 @@
|
||||
"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
|
||||
"run hasfirstboot || setenv partnum 0; " \
|
||||
"if test ${partnum} != 0; then " \
|
||||
"setenv bootcause REVERT; " \
|
||||
"run swappartitions loadimage doboot; " \
|
||||
"fi; " \
|
||||
"run failbootcmd\0" \
|
||||
@@ -113,7 +111,7 @@
|
||||
"doboot=" \
|
||||
"echo Booting from ${dev}:${devnum}:${partnum} ...; " \
|
||||
"run setargs; " \
|
||||
"bootm ${loadaddr}#conf@${confidx}\0" \
|
||||
"bootm ${loadaddr}\0" \
|
||||
"tryboot=" \
|
||||
"setenv partnum 1; run hasfirstboot || setenv partnum 2; " \
|
||||
"run loadimage || run swappartitions && run loadimage || " \
|
||||
@@ -130,7 +128,7 @@
|
||||
#define CONFIG_USBBOOTCOMMAND \
|
||||
"echo Unsupported; " \
|
||||
|
||||
#ifdef CONFIG_NFS_CMD
|
||||
#ifdef CONFIG_CMD_NFS
|
||||
#define CONFIG_BOOTCOMMAND CONFIG_NETWORKBOOTCOMMAND
|
||||
#elif CONFIG_CMD_USB
|
||||
#define CONFIG_BOOTCOMMAND CONFIG_USBBOOTCOMMAND
|
||||
|
||||
@@ -32,16 +32,6 @@
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
||||
|
||||
/* Init Functions */
|
||||
|
||||
/* Driver Model */
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#define CONFIG_DM_THERMAL
|
||||
#endif
|
||||
|
||||
/* Thermal */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Serial */
|
||||
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||||
|
||||
|
||||
@@ -32,9 +32,6 @@
|
||||
*/
|
||||
#define CONFIG_BOOTP_BOOTFILESIZE
|
||||
|
||||
/* UBI Support for all Keymile boards */
|
||||
#define CONFIG_MTD_CONCAT
|
||||
|
||||
#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
|
||||
#define CONFIG_KM_DEF_ENV_BOOTPARAMS \
|
||||
"actual_bank=0\0"
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
|
||||
/* Do boardspecific init for all boards */
|
||||
|
||||
#define CONFIG_JFFS2_CMDLINE
|
||||
|
||||
/* EEprom support 24C08, 24C16, 24C64 */
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 /* 8 Byte write page */
|
||||
|
||||
@@ -337,9 +337,6 @@ int get_scl(void);
|
||||
* additionnal command line configuration.
|
||||
*/
|
||||
|
||||
/* we don't need flash support */
|
||||
#undef CONFIG_JFFS2_CMDLINE
|
||||
|
||||
/*
|
||||
* For booting Linux, the board info and command line data
|
||||
* have to be in the first 64 MB of memory, since this is
|
||||
|
||||
@@ -89,8 +89,8 @@
|
||||
"ramdisk_addr_r=0x88080000\0"
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(NVME, nvme, 0) \
|
||||
func(USB, usb, 0) \
|
||||
func(DHCP, dhcp, 0) \
|
||||
|
||||
@@ -141,6 +141,4 @@
|
||||
#define CONFIG_ETHPRIME "FEC"
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#endif
|
||||
|
||||
@@ -102,5 +102,67 @@
|
||||
|
||||
#define CONFIG_PCI_SCAN_SHOW
|
||||
|
||||
#undef CONFIG_EXTRA_ENV_SETTINGS
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"verify=no\0" \
|
||||
"fdt_addr=0x00f00000\0" \
|
||||
"kernel_addr=0x01000000\0" \
|
||||
"kernelheader_addr=0x600000\0" \
|
||||
"scriptaddr=0x80000000\0" \
|
||||
"scripthdraddr=0x80080000\0" \
|
||||
"fdtheader_addr_r=0x80100000\0" \
|
||||
"kernelheader_addr_r=0x80200000\0" \
|
||||
"kernel_addr_r=0x96000000\0" \
|
||||
"fdt_addr_r=0x90000000\0" \
|
||||
"load_addr=0xa0000000\0" \
|
||||
"kernel_size=0x2800000\0" \
|
||||
"kernelheader_size=0x40000\0" \
|
||||
"console=ttyS0,115200\0" \
|
||||
BOOTENV \
|
||||
"boot_scripts=ls1012aqds_boot.scr\0" \
|
||||
"boot_script_hdr=hdr_ls1012aqds_bs.out\0" \
|
||||
"scan_dev_for_boot_part=" \
|
||||
"part list ${devtype} ${devnum} devplist; " \
|
||||
"env exists devplist || setenv devplist 1; " \
|
||||
"for distro_bootpart in ${devplist}; do " \
|
||||
"if fstype ${devtype} " \
|
||||
"${devnum}:${distro_bootpart} " \
|
||||
"bootfstype; then " \
|
||||
"run scan_dev_for_boot; " \
|
||||
"fi; " \
|
||||
"done\0" \
|
||||
"scan_dev_for_boot=" \
|
||||
"echo Scanning ${devtype} " \
|
||||
"${devnum}:${distro_bootpart}...; " \
|
||||
"for prefix in ${boot_prefixes}; do " \
|
||||
"run scan_dev_for_scripts; " \
|
||||
"done;" \
|
||||
"\0" \
|
||||
"boot_a_script=" \
|
||||
"load ${devtype} ${devnum}:${distro_bootpart} " \
|
||||
"${scriptaddr} ${prefix}${script}; " \
|
||||
"env exists secureboot && load ${devtype} " \
|
||||
"${devnum}:${distro_bootpart} " \
|
||||
"${scripthdraddr} ${prefix}${boot_script_hdr}; " \
|
||||
"env exists secureboot " \
|
||||
"&& esbc_validate ${scripthdraddr};" \
|
||||
"source ${scriptaddr}\0" \
|
||||
"qspi_bootcmd=pfe stop; echo Trying load from qspi..;" \
|
||||
"sf probe 0:0 && sf read $load_addr " \
|
||||
"$kernel_addr $kernel_size; env exists secureboot " \
|
||||
"&& sf read $kernelheader_addr_r $kernelheader_addr " \
|
||||
"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; " \
|
||||
"bootm $load_addr#$board\0"
|
||||
|
||||
#undef CONFIG_BOOTCOMMAND
|
||||
#ifdef CONFIG_TFABOOT
|
||||
#undef QSPI_NOR_BOOTCOMMAND
|
||||
#define QSPI_NOR_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||
"env exists secureboot && esbc_halt;"
|
||||
#else
|
||||
#define CONFIG_BOOTCOMMAND "pfe stop; run distro_bootcmd; run qspi_bootcmd; "\
|
||||
"env exists secureboot && esbc_halt;"
|
||||
#endif
|
||||
|
||||
#include <asm/fsl_secure_boot.h>
|
||||
#endif /* __LS1012AQDS_H__ */
|
||||
|
||||
@@ -247,12 +247,12 @@
|
||||
"kernelheader_start=0x800000\0" \
|
||||
"fdt_addr_r=0x90000000\0" \
|
||||
"load_addr=0xa0000000\0" \
|
||||
"kernelheader_addr=0x60800000\0" \
|
||||
"kernelheader_addr=0x60600000\0" \
|
||||
"kernel_size=0x2800000\0" \
|
||||
"kernelheader_size=0x40000\0" \
|
||||
"kernel_addr_sd=0x8000\0" \
|
||||
"kernel_size_sd=0x14000\0" \
|
||||
"kernelhdr_addr_sd=0x4000\0" \
|
||||
"kernelhdr_addr_sd=0x3000\0" \
|
||||
"kernelhdr_size_sd=0x10\0" \
|
||||
"console=ttyS0,115200\0" \
|
||||
"boot_os=y\0" \
|
||||
|
||||
@@ -149,8 +149,10 @@
|
||||
/* USB */
|
||||
#ifdef CONFIG_USB
|
||||
#define CONFIG_HAS_FSL_XHCI_USB
|
||||
#ifndef CONFIG_TARGET_LX2162AQDS
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* FlexSPI */
|
||||
#ifdef CONFIG_NXP_FSPI
|
||||
@@ -230,7 +232,7 @@ unsigned long get_board_ddr_clk(void);
|
||||
"kernel_size=0x2800000\0" \
|
||||
"kernel_addr_sd=0x8000\0" \
|
||||
"kernelhdr_addr_sd=0x3000\0" \
|
||||
"kernel_size_sd=0x1d000\0" \
|
||||
"kernel_size_sd=0x14000\0" \
|
||||
"kernelhdr_size_sd=0x20\0" \
|
||||
"console=ttyAMA0,38400n8\0" \
|
||||
BOOTENV \
|
||||
|
||||
@@ -8,70 +8,14 @@
|
||||
|
||||
#include "lx2160a_common.h"
|
||||
|
||||
/* Qixis */
|
||||
#define QIXIS_XMAP_MASK 0x07
|
||||
#define QIXIS_XMAP_SHIFT 5
|
||||
#define QIXIS_RST_CTL_RESET_EN 0x30
|
||||
#define QIXIS_LBMAP_DFLTBANK 0x00
|
||||
#define QIXIS_LBMAP_ALTBANK 0x20
|
||||
#define QIXIS_LBMAP_QSPI 0x00
|
||||
#define QIXIS_RCW_SRC_QSPI 0xff
|
||||
#define QIXIS_RST_CTL_RESET 0x31
|
||||
#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20
|
||||
#define QIXIS_RCFG_CTL_RECONFIG_START 0x21
|
||||
#define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08
|
||||
#define QIXIS_LBMAP_MASK 0x0f
|
||||
#define QIXIS_LBMAP_SD
|
||||
#define QIXIS_LBMAP_EMMC
|
||||
#define QIXIS_RCW_SRC_SD 0x08
|
||||
#define QIXIS_RCW_SRC_EMMC 0x09
|
||||
#define NON_EXTENDED_DUTCFG
|
||||
#define QIXIS_SDID_MASK 0x07
|
||||
#define QIXIS_ESDHC_NO_ADAPTER 0x7
|
||||
|
||||
/* SYSCLK */
|
||||
#define QIXIS_SYSCLK_100 0x0
|
||||
#define QIXIS_SYSCLK_125 0x1
|
||||
#define QIXIS_SYSCLK_133 0x2
|
||||
|
||||
/* DDRCLK */
|
||||
#define QIXIS_DDRCLK_100 0x0
|
||||
#define QIXIS_DDRCLK_125 0x1
|
||||
#define QIXIS_DDRCLK_133 0x2
|
||||
|
||||
#define BRDCFG4_EMI1SEL_MASK 0xF8
|
||||
#define BRDCFG4_EMI1SEL_SHIFT 3
|
||||
#define BRDCFG4_EMI2SEL_MASK 0x07
|
||||
#define BRDCFG4_EMI2SEL_SHIFT 0
|
||||
|
||||
/* VID */
|
||||
|
||||
#define I2C_MUX_CH_VOL_MONITOR 0xA
|
||||
/* Voltage monitor on channel 2*/
|
||||
#define I2C_VOL_MONITOR_ADDR 0x63
|
||||
#define I2C_VOL_MONITOR_BUS_V_OFFSET 0x2
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
#define CONFIG_VID_FLS_ENV "lx2160aqds_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
|
||||
/* The lowest and highest voltage allowed*/
|
||||
#define VDD_MV_MIN 775
|
||||
#define VDD_MV_MAX 925
|
||||
|
||||
/* PM Bus commands code for LTC3882*/
|
||||
#define PMBUS_CMD_PAGE 0x0
|
||||
#define PMBUS_CMD_READ_VOUT 0x8B
|
||||
#define PMBUS_CMD_PAGE_PLUS_WRITE 0x05
|
||||
#define PMBUS_CMD_VOUT_COMMAND 0x21
|
||||
#define PWM_CHANNEL0 0x0
|
||||
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
/* RTC */
|
||||
#define CONFIG_SYS_RTC_BUS_NUM 0
|
||||
#define I2C_MUX_CH_RTC 0xB
|
||||
|
||||
/*
|
||||
* MMC
|
||||
@@ -87,26 +31,6 @@ u8 qixis_esdhc_detect_quirk(void);
|
||||
#if defined(CONFIG_FSL_MC_ENET)
|
||||
#define CONFIG_MII
|
||||
#define CONFIG_ETHPRIME "DPMAC17@rgmii-id"
|
||||
|
||||
#define AQ_PHY_ADDR1 0x00
|
||||
#define AQ_PHY_ADDR2 0x01
|
||||
#define AQ_PHY_ADDR3 0x02
|
||||
#define AQ_PHY_ADDR4 0x03
|
||||
|
||||
#define CORTINA_NO_FW_UPLOAD
|
||||
#define CORTINA_PHY_ADDR1 0x0
|
||||
|
||||
#define INPHI_PHY_ADDR1 0x0
|
||||
#define INPHI_PHY_ADDR2 0x1
|
||||
|
||||
#define RGMII_PHY_ADDR1 0x01
|
||||
#define RGMII_PHY_ADDR2 0x02
|
||||
|
||||
#define SGMII_CARD_PORT1_PHY_ADDR 0x1C
|
||||
#define SGMII_CARD_PORT2_PHY_ADDR 0x1D
|
||||
#define SGMII_CARD_PORT3_PHY_ADDR 0x1E
|
||||
#define SGMII_CARD_PORT4_PHY_ADDR 0x1F
|
||||
|
||||
#endif
|
||||
|
||||
/* EEPROM */
|
||||
|
||||
@@ -8,47 +8,9 @@
|
||||
|
||||
#include "lx2160a_common.h"
|
||||
|
||||
/* Qixis */
|
||||
#define QIXIS_XMAP_MASK 0x07
|
||||
#define QIXIS_XMAP_SHIFT 5
|
||||
#define QIXIS_RST_CTL_RESET_EN 0x30
|
||||
#define QIXIS_LBMAP_DFLTBANK 0x00
|
||||
#define QIXIS_LBMAP_ALTBANK 0x20
|
||||
#define QIXIS_LBMAP_QSPI 0x00
|
||||
#define QIXIS_RCW_SRC_QSPI 0xff
|
||||
#define QIXIS_RST_CTL_RESET 0x31
|
||||
#define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20
|
||||
#define QIXIS_RCFG_CTL_RECONFIG_START 0x21
|
||||
#define QIXIS_RCFG_CTL_WATCHDOG_ENBLE 0x08
|
||||
#define QIXIS_LBMAP_MASK 0x0f
|
||||
#define QIXIS_LBMAP_SD
|
||||
#define QIXIS_LBMAP_EMMC
|
||||
#define QIXIS_RCW_SRC_SD 0x08
|
||||
#define QIXIS_RCW_SRC_EMMC 0x09
|
||||
#define NON_EXTENDED_DUTCFG
|
||||
|
||||
/* VID */
|
||||
|
||||
#define I2C_MUX_CH_VOL_MONITOR 0xA
|
||||
/* Voltage monitor on channel 2*/
|
||||
#define I2C_VOL_MONITOR_ADDR 0x63
|
||||
#define I2C_VOL_MONITOR_BUS_V_OFFSET 0x2
|
||||
#define I2C_VOL_MONITOR_BUS_V_OVF 0x1
|
||||
#define I2C_VOL_MONITOR_BUS_V_SHIFT 3
|
||||
#define CONFIG_VID_FLS_ENV "lx2160ardb_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
|
||||
/* The lowest and highest voltage allowed*/
|
||||
#define VDD_MV_MIN 775
|
||||
#define VDD_MV_MAX 855
|
||||
|
||||
/* PM Bus commands code for LTC3882*/
|
||||
#define PMBUS_CMD_PAGE 0x0
|
||||
#define PMBUS_CMD_READ_VOUT 0x8B
|
||||
#define PMBUS_CMD_PAGE_PLUS_WRITE 0x05
|
||||
#define PMBUS_CMD_VOUT_COMMAND 0x21
|
||||
#define PWM_CHANNEL0 0x0
|
||||
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
@@ -59,18 +21,6 @@
|
||||
#if defined(CONFIG_FSL_MC_ENET)
|
||||
#define CONFIG_MII
|
||||
#define CONFIG_ETHPRIME "DPMAC1@xgmii"
|
||||
|
||||
#define AQR107_PHY_ADDR1 0x04
|
||||
#define AQR107_PHY_ADDR2 0x05
|
||||
#define AQR107_IRQ_MASK 0x0C
|
||||
|
||||
#define CORTINA_NO_FW_UPLOAD
|
||||
#define CORTINA_PHY_ADDR1 0x0
|
||||
#define INPHI_PHY_ADDR1 0x0
|
||||
|
||||
#define RGMII_PHY_ADDR1 0x01
|
||||
#define RGMII_PHY_ADDR2 0x02
|
||||
|
||||
#endif
|
||||
|
||||
/* EMC2305 */
|
||||
|
||||
78
include/configs/lx2162aqds.h
Normal file
78
include/configs/lx2162aqds.h
Normal file
@@ -0,0 +1,78 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright 2020 NXP
|
||||
*/
|
||||
|
||||
#ifndef __LX2162_QDS_H
|
||||
#define __LX2162_QDS_H
|
||||
|
||||
#include "lx2160a_common.h"
|
||||
|
||||
/* USB */
|
||||
#undef CONFIG_USB_MAX_CONTROLLER_COUNT
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
|
||||
/* Voltage monitor on channel 2*/
|
||||
#define CONFIG_VID_FLS_ENV "lx2162aqds_vdd_mv"
|
||||
#define CONFIG_VID
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_SET
|
||||
#define CONFIG_VOL_MONITOR_LTC3882_READ
|
||||
|
||||
/* RTC */
|
||||
#define CONFIG_SYS_RTC_BUS_NUM 0
|
||||
|
||||
/*
|
||||
* MMC
|
||||
*/
|
||||
#ifdef CONFIG_MMC
|
||||
#ifndef __ASSEMBLY__
|
||||
u8 qixis_esdhc_detect_quirk(void);
|
||||
#endif
|
||||
#define CONFIG_ESDHC_DETECT_QUIRK qixis_esdhc_detect_quirk()
|
||||
#endif
|
||||
|
||||
/* MAC/PHY configuration */
|
||||
#if defined(CONFIG_FSL_MC_ENET)
|
||||
#define CONFIG_MII
|
||||
#define CONFIG_ETHPRIME "DPMAC17@rgmii-id"
|
||||
#endif
|
||||
|
||||
/* EEPROM */
|
||||
#define CONFIG_ID_EEPROM
|
||||
#define CONFIG_SYS_I2C_EEPROM_NXID
|
||||
#define CONFIG_SYS_EEPROM_BUS_NUM 0
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57
|
||||
#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
|
||||
/* Initial environment variables */
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
EXTRA_ENV_SETTINGS \
|
||||
"boot_scripts=lx2162aqds_boot.scr\0" \
|
||||
"boot_script_hdr=hdr_lx2162aqds_bs.out\0" \
|
||||
"BOARD=lx2162aqds\0" \
|
||||
"xspi_bootcmd=echo Trying load from flexspi..;" \
|
||||
"sf probe 0:0 && sf read $load_addr " \
|
||||
"$kernel_start $kernel_size ; env exists secureboot &&" \
|
||||
"sf read $kernelheader_addr_r $kernelheader_start " \
|
||||
"$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\
|
||||
" bootm $load_addr#$BOARD\0" \
|
||||
"sd_bootcmd=echo Trying load from sd card..;" \
|
||||
"mmc dev 0; mmcinfo; mmc read $load_addr " \
|
||||
"$kernel_addr_sd $kernel_size_sd ;" \
|
||||
"env exists secureboot && mmc read $kernelheader_addr_r "\
|
||||
"$kernelhdr_addr_sd $kernelhdr_size_sd " \
|
||||
" && esbc_validate ${kernelheader_addr_r};" \
|
||||
"bootm $load_addr#$BOARD\0" \
|
||||
"emmc_bootcmd=echo Trying load from emmc card..;" \
|
||||
"mmc dev 1; mmcinfo; mmc read $load_addr " \
|
||||
"$kernel_addr_sd $kernel_size_sd ;" \
|
||||
"env exists secureboot && mmc read $kernelheader_addr_r "\
|
||||
"$kernelhdr_addr_sd $kernelhdr_size_sd " \
|
||||
" && esbc_validate ${kernelheader_addr_r};" \
|
||||
"bootm $load_addr#$BOARD\0"
|
||||
|
||||
#include <asm/fsl_secure_boot.h>
|
||||
|
||||
#endif /* __LX2162_QDS_H */
|
||||
@@ -13,8 +13,6 @@
|
||||
|
||||
#include "imx6_spl.h"
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
||||
|
||||
/* MMC Configs */
|
||||
|
||||
@@ -12,8 +12,6 @@
|
||||
|
||||
#include "mx6_common.h"
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
|
||||
|
||||
|
||||
@@ -132,6 +132,4 @@
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -123,8 +123,6 @@
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 3
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_IOMUX_LPSR
|
||||
|
||||
/* USB Configs */
|
||||
|
||||
@@ -138,8 +138,6 @@
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@@ -170,8 +170,6 @@
|
||||
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1)
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#ifdef CONFIG_VIDEO
|
||||
#define CONFIG_VIDEO_MXS
|
||||
|
||||
@@ -177,8 +177,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#if defined(CONFIG_DM_VIDEO)
|
||||
#define CONFIG_VIDEO_MXS
|
||||
|
||||
@@ -150,8 +150,6 @@
|
||||
/* environment organization */
|
||||
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_IOMUX_LPSR
|
||||
|
||||
#define CONFIG_SOFT_SPI
|
||||
|
||||
@@ -134,8 +134,6 @@
|
||||
/* USB Configs */
|
||||
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_USBD_HS
|
||||
|
||||
#ifdef CONFIG_VIDEO
|
||||
|
||||
@@ -50,8 +50,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"console=ttymxc0,115200n8\0" \
|
||||
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
|
||||
|
||||
@@ -74,9 +74,6 @@
|
||||
#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5
|
||||
#endif
|
||||
|
||||
/* Thermal support */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Physical Memory Map */
|
||||
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
|
||||
|
||||
|
||||
@@ -62,8 +62,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"console=ttymxc0,115200n8\0" \
|
||||
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
|
||||
|
||||
@@ -69,8 +69,6 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define ENV_MMC \
|
||||
"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
|
||||
"mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \
|
||||
|
||||
@@ -13,9 +13,6 @@
|
||||
|
||||
#include "mx6_common.h"
|
||||
|
||||
/* Thermal */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Serial */
|
||||
#define CONFIG_MXC_UART_BASE UART4_BASE
|
||||
#define CONSOLE_DEV "ttymxc3"
|
||||
|
||||
@@ -168,6 +168,4 @@
|
||||
#define CONFIG_MXC_USB_FLAGS 0
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#endif
|
||||
|
||||
@@ -190,7 +190,6 @@
|
||||
|
||||
#endif
|
||||
|
||||
#define CONFIG_JFFS2_CMDLINE 1
|
||||
#define CONFIG_JFFS2_NAND 1
|
||||
#define CONFIG_JFFS2_DEV "nand0" /* NAND device jffs2 lives on */
|
||||
#define CONFIG_JFFS2_PART_OFFSET 0 /* start of jffs2 partition */
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(QEMU, qemu, na) \
|
||||
func(VIRTIO, virtio, 0) \
|
||||
func(SCSI, scsi, 0) \
|
||||
func(DHCP, dhcp, na)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
@@ -10,9 +10,6 @@
|
||||
#include "mx6_common.h"
|
||||
#include "imx6_spl.h"
|
||||
|
||||
/* Thermal */
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Serial */
|
||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||
|
||||
|
||||
@@ -104,6 +104,4 @@
|
||||
#define CONFIG_ETHPRIME "eth0"
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics SA 2017
|
||||
* Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
|
||||
* Author(s): Patrice CHOTARD, <patrice.chotard@foss.st.com> for STMicroelectronics.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) STMicroelectronics SA 2017
|
||||
* Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics.
|
||||
* Author(s): Patrice CHOTARD, <patrice.chotard@foss.st.com> for STMicroelectronics.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Copyright (C) 2017, STMicroelectronics - All Rights Reserved
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics.
|
||||
* Author(s): Patrice Chotard, <patrice.chotard@foss.st.com> for STMicroelectronics.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_H
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000
|
||||
|
||||
/* spi not partitions */
|
||||
#define CONFIG_JFFS2_CMDLINE
|
||||
#define CONFIG_JFFS2_DEV "nor0"
|
||||
|
||||
/* Timer */
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* Physical Memory Map */
|
||||
#define CONFIG_SYS_SDRAM_BASE MMDC0_ARB_BASE_ADDR
|
||||
|
||||
|
||||
@@ -49,6 +49,12 @@
|
||||
/* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE)
|
||||
|
||||
#ifdef CONFIG_ARM64
|
||||
#define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
|
||||
#else
|
||||
#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Physical Memory Map
|
||||
*/
|
||||
|
||||
@@ -50,6 +50,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
|
||||
@@ -20,6 +20,12 @@
|
||||
/* Generic Interrupt Controller */
|
||||
#define CONFIG_GICV2
|
||||
|
||||
#undef FDTFILE
|
||||
#define BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||||
"if test -z \"${fdtfile}\" -a -n \"${soc}\"; then " \
|
||||
"setenv efi_fdtfile ${vendor}/${soc}-${board}${boardver}.dtb; " \
|
||||
"fi; "
|
||||
|
||||
/*
|
||||
* Memory layout for where various images get loaded by boot scripts:
|
||||
*
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
"scriptaddr=0x10000000\0" \
|
||||
"pxefile_addr_r=0x10100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x03000000\0" \
|
||||
"ramdisk_addr_r=0x03100000\0"
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83200000\0"
|
||||
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
"scriptaddr=0x90000000\0" \
|
||||
"pxefile_addr_r=0x90100000\0" \
|
||||
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||
"fdtfile=" FDTFILE "\0" \
|
||||
"fdt_addr_r=0x83000000\0" \
|
||||
"ramdisk_addr_r=0x83100000\0"
|
||||
|
||||
|
||||
@@ -70,10 +70,6 @@
|
||||
#define CONFIG_SYS_INIT_SP_ADDR \
|
||||
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
|
||||
|
||||
/* Environment organization */
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
/* I2C configs */
|
||||
#define CONFIG_SYS_I2C
|
||||
#define CONFIG_SYS_I2C_MXC
|
||||
|
||||
@@ -73,8 +73,6 @@
|
||||
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
|
||||
#endif
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_IMX6_PWM_PER_CLK 66000000
|
||||
|
||||
#ifdef CONFIG_ENV_IS_IN_MMC
|
||||
|
||||
@@ -146,8 +146,6 @@
|
||||
|
||||
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_USBD_HS
|
||||
|
||||
/* USB Device Firmware Update support */
|
||||
|
||||
@@ -63,8 +63,6 @@
|
||||
#define CONFIG_FEC_XCV_TYPE RMII
|
||||
#define CONFIG_ETHPRIME "FEC"
|
||||
|
||||
#define CONFIG_IMX_THERMAL
|
||||
|
||||
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
|
||||
|
||||
#define CONFIG_UBOOT_SECTOR_START 0x2
|
||||
|
||||
Reference in New Issue
Block a user