Merge branch '2019-10-04-master-imports'
- Assorted TI platform fixes - Revert the change that broke environment flag validation - Assorted typo fixes - Assorted Kconfig dependency fixes - Other minor bug fixes
This commit is contained in:
commit
62861c70d3
@ -111,6 +111,7 @@ F: cmd/arm/
|
||||
ARM ALTERA SOCFPGA
|
||||
M: Marek Vasut <marex@denx.de>
|
||||
M: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
|
||||
M: Ley Foon Tan <ley.foon.tan@intel.com>
|
||||
S: Maintainted
|
||||
T: git https://gitlab.denx.de/u-boot/custodians/u-boot-socfpga.git
|
||||
F: arch/arm/mach-socfpga/
|
||||
|
4
Makefile
4
Makefile
@ -1232,7 +1232,7 @@ ifndef CONFIG_SYS_UBOOT_START
|
||||
CONFIG_SYS_UBOOT_START := 0
|
||||
endif
|
||||
|
||||
# Boards with more complex image requirments can provide an .its source file
|
||||
# Boards with more complex image requirements can provide an .its source file
|
||||
# or a generator script
|
||||
ifneq ($(CONFIG_SPL_FIT_SOURCE),"")
|
||||
U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE))
|
||||
@ -1875,7 +1875,7 @@ clean: $(clean-dirs)
|
||||
$(call cmd,rmfiles)
|
||||
@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
|
||||
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
|
||||
-o -name '*.ko.*' -o -name '*.su' \
|
||||
-o -name '*.ko.*' -o -name '*.su' -o -name '*.pyc' \
|
||||
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
|
||||
-o -name '*.lex.c' -o -name '*.tab.[ch]' \
|
||||
-o -name '*.symtypes' -o -name 'modules.order' \
|
||||
|
18
arch/arm/dts/imx6q-logicpd-u-boot.dtsi
Normal file
18
arch/arm/dts/imx6q-logicpd-u-boot.dtsi
Normal file
@ -0,0 +1,18 @@
|
||||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/*
|
||||
* Copyright (C) 2019 Logic PD <aford173@gmail.com>
|
||||
*/
|
||||
|
||||
#include "imx6qdl-u-boot.dtsi"
|
||||
|
||||
&uart1 {
|
||||
u-boot,dm-spl;
|
||||
};
|
||||
|
||||
&usdhc1 {
|
||||
u-boot,dm-spl;
|
||||
};
|
||||
|
||||
&usdhc2 {
|
||||
u-boot,dm-spl;
|
||||
};
|
@ -98,7 +98,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART
|
||||
config K3_SYSFW_IMAGE_SIZE_MAX
|
||||
int "Amount of memory dynamically allocated for loading SYSFW blob"
|
||||
depends on K3_LOAD_SYSFW
|
||||
default 269000
|
||||
default 276000
|
||||
help
|
||||
Amount of memory (in bytes) reserved through dynamic allocation at
|
||||
runtime for loading the combined System Firmware and configuration image
|
||||
|
@ -137,6 +137,26 @@ int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int fdt_disable_node(void *blob, char *node_path)
|
||||
{
|
||||
int offs;
|
||||
int ret;
|
||||
|
||||
offs = fdt_path_offset(blob, node_path);
|
||||
if (offs < 0) {
|
||||
debug("Node %s not found.\n", node_path);
|
||||
return 0;
|
||||
}
|
||||
ret = fdt_setprop_string(blob, offs, "status", "disabled");
|
||||
if (ret < 0) {
|
||||
printf("Could not add status property to node %s: %s\n",
|
||||
node_path, fdt_strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYSRESET
|
||||
|
@ -14,4 +14,6 @@ struct ti_sci_handle *get_ti_sci_handle(void);
|
||||
int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name);
|
||||
int do_board_detect(void);
|
||||
void release_resources_for_core_shutdown(void);
|
||||
int fdt_disable_node(void *blob, char *node_path);
|
||||
|
||||
#endif
|
||||
|
@ -7,3 +7,4 @@ F: configs/imx6q_logic_defconfig
|
||||
F: arch/arm/dts/imx6-logicpd-baseboard.dtsi
|
||||
F: arch/arm/dts/imx6-logicpd-som.dtsi
|
||||
F: arch/arm/dts/imx6q-logicpd.dts
|
||||
F: arch/arm/dts/imx6q-logicpd-u-boot.dtsi
|
||||
|
@ -96,10 +96,21 @@ int ft_board_setup(void *blob, bd_t *bd)
|
||||
int ret;
|
||||
|
||||
ret = fdt_fixup_msmc_ram(blob, "/interconnect@100000", "sram@70000000");
|
||||
if (ret)
|
||||
if (ret) {
|
||||
printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return ret;
|
||||
#if defined(CONFIG_TI_SECURE_DEVICE)
|
||||
/* Make HW RNG reserved for secure world use */
|
||||
ret = fdt_disable_node(blob, "/interconnect@100000/trng@4e10000");
|
||||
if (ret) {
|
||||
printf("%s: disabling TRGN failed %d\n", __func__, ret);
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
51
cmd/Kconfig
51
cmd/Kconfig
@ -172,6 +172,7 @@ config AUTOBOOT_MENUKEY
|
||||
|
||||
config AUTOBOOT_MENU_SHOW
|
||||
bool "Show a menu on boot"
|
||||
depends on CMD_BOOTMENU
|
||||
help
|
||||
This enables the boot menu, controlled by environment variables
|
||||
defined by the board. The menu starts after running the 'preboot'
|
||||
@ -267,6 +268,54 @@ config CMD_BOOTEFI
|
||||
help
|
||||
Boot an EFI image from memory.
|
||||
|
||||
config BOOTM_LINUX
|
||||
bool "Support booting Linux OS images"
|
||||
depends on CMD_BOOTM || CMD_BOOTZ || CMD_BOOTI
|
||||
default y
|
||||
help
|
||||
Support booting the Linux kernel directly via a command such as bootm
|
||||
or booti or bootz.
|
||||
|
||||
config BOOTM_NETBSD
|
||||
bool "Support booting NetBSD (non-EFI) loader images"
|
||||
depends on CMD_BOOTM
|
||||
default y
|
||||
help
|
||||
Support booting NetBSD via the bootm command.
|
||||
|
||||
config BOOTM_OPENRTOS
|
||||
bool "Support booting OPENRTOS / FreeRTOS images"
|
||||
depends on CMD_BOOTM
|
||||
help
|
||||
Support booting OPENRTOS / FreeRTOS via the bootm command.
|
||||
|
||||
config BOOTM_OSE
|
||||
bool "Support booting Enea OSE images"
|
||||
depends on CMD_BOOTM
|
||||
help
|
||||
Support booting Enea OSE images via the bootm command.
|
||||
|
||||
config BOOTM_PLAN9
|
||||
bool "Support booting Plan9 OS images"
|
||||
depends on CMD_BOOTM
|
||||
default y
|
||||
help
|
||||
Support booting Plan9 images via the bootm command.
|
||||
|
||||
config BOOTM_RTEMS
|
||||
bool "Support booting RTEMS OS images"
|
||||
depends on CMD_BOOTM
|
||||
default y
|
||||
help
|
||||
Support booting RTEMS images via the bootm command.
|
||||
|
||||
config BOOTM_VXWORKS
|
||||
bool "Support booting VxWorks OS images"
|
||||
depends on CMD_BOOTM
|
||||
default y
|
||||
help
|
||||
Support booting VxWorks images via the bootm command.
|
||||
|
||||
config CMD_BOOTEFI_HELLO_COMPILE
|
||||
bool "Compile a standard EFI hello world binary for testing"
|
||||
depends on CMD_BOOTEFI && !CPU_V7M && !SANDBOX
|
||||
@ -1468,7 +1517,7 @@ config CMD_BMP
|
||||
bool "Enable 'bmp' command"
|
||||
depends on LCD || DM_VIDEO || VIDEO
|
||||
help
|
||||
This provides a way to obtain information about a BMP-format iamge
|
||||
This provides a way to obtain information about a BMP-format image
|
||||
and to display it. BMP (which presumably stands for BitMaP) is a
|
||||
file format defined by Microsoft which supports images of various
|
||||
depths, formats and compression methods. Headers on the file
|
||||
|
@ -152,7 +152,7 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param)
|
||||
snprintf(buf, sizeof(buf), LBAF, info.size);
|
||||
break;
|
||||
case CMD_PART_INFO_NUMBER:
|
||||
snprintf(buf, sizeof(buf), "%d", part);
|
||||
snprintf(buf, sizeof(buf), "0x%x", part);
|
||||
break;
|
||||
default:
|
||||
printf("** Unknown cmd_part_info value: %d\n", param);
|
||||
|
@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_CMD_CPU=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
CONFIG_CMD_ASKENV=y
|
||||
CONFIG_CMD_MEMTEST=y
|
||||
CONFIG_CMD_CLK=y
|
||||
|
@ -41,6 +41,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
# CONFIG_CMD_EDITENV is not set
|
||||
|
@ -36,6 +36,9 @@ CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
# CONFIG_CMD_EDITENV is not set
|
||||
|
@ -26,6 +26,9 @@ CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
CONFIG_SYS_PROMPT="CL-SOM-iMX7 # "
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
# CONFIG_CMD_EXPORTENV is not set
|
||||
|
@ -16,6 +16,8 @@ CONFIG_VERSION_VARIABLE=y
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_BOUNCE_BUFFER=y
|
||||
CONFIG_SYS_PROMPT="Colibri iMX6ULL # "
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_ELF is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
|
@ -12,6 +12,7 @@ CONFIG_VERSION_VARIABLE=y
|
||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||
CONFIG_BOARD_EARLY_INIT_F=y
|
||||
CONFIG_CMD_CPU=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
CONFIG_CMD_ASKENV=y
|
||||
CONFIG_CMD_MEMTEST=y
|
||||
CONFIG_CMD_CLK=y
|
||||
|
@ -19,6 +19,8 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_BOUNCE_BUFFER=y
|
||||
CONFIG_SYS_PROMPT="Colibri iMX7 # "
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
CONFIG_CMD_ASKENV=y
|
||||
|
@ -20,6 +20,8 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
||||
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||||
CONFIG_SYS_PROMPT="Colibri iMX7 # "
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
CONFIG_CMD_ASKENV=y
|
||||
|
@ -14,6 +14,7 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
|
||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
|
||||
CONFIG_SPL_BOARD_INIT=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_CACHE=y
|
||||
|
@ -24,6 +24,7 @@ CONFIG_SPL_POWER_SUPPORT=y
|
||||
CONFIG_SPL_POWER_DOMAIN=y
|
||||
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
||||
CONFIG_CMD_CPU=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_CMD_IMPORTENV is not set
|
||||
CONFIG_CMD_CLK=y
|
||||
CONFIG_CMD_DM=y
|
||||
|
@ -27,6 +27,7 @@ CONFIG_SPL_POWER_DOMAIN=y
|
||||
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
CONFIG_CMD_CPU=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_CMD_IMPORTENV is not set
|
||||
CONFIG_CMD_CLK=y
|
||||
CONFIG_CMD_DM=y
|
||||
|
@ -14,6 +14,9 @@ CONFIG_BOUNCE_BUFFER=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
# CONFIG_CMD_EXPORTENV is not set
|
||||
|
@ -13,6 +13,9 @@ CONFIG_BOUNCE_BUFFER=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
# CONFIG_CMD_BOOTD is not set
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
# CONFIG_BOOTM_NETBSD is not set
|
||||
# CONFIG_BOOTM_PLAN9 is not set
|
||||
# CONFIG_BOOTM_RTEMS is not set
|
||||
# CONFIG_CMD_IMI is not set
|
||||
# CONFIG_CMD_XIMG is not set
|
||||
# CONFIG_CMD_EXPORTENV is not set
|
||||
|
@ -28,6 +28,7 @@ alias jaehoon Jaehoon Chung <jh80.chung@samsung.com>
|
||||
alias jagan Jagan Teki <jagan@amarulasolutions.com>
|
||||
alias jhersh Joe Hershberger <joe.hershberger@ni.com>
|
||||
alias kevery Kever Yang <kever.yang@rock-chips.com>
|
||||
alias leyfoon Ley Foon Tan <ley.foon.tan@intel.com>
|
||||
alias lukma Lukasz Majewski <lukma@denx.de>
|
||||
alias macpaul Macpaul Lin <macpaul@andestech.com>
|
||||
alias marex Marek Vasut <marex@denx.de>
|
||||
@ -66,7 +67,7 @@ alias s3c samsung
|
||||
alias s5pc samsung
|
||||
alias samsung uboot, prom
|
||||
alias snapdragon uboot, mateusz
|
||||
alias socfpga uboot, marex, dinh, simongoldschmidt
|
||||
alias socfpga uboot, marex, dinh, simongoldschmidt, leyfoon
|
||||
alias sunxi uboot, jagan, maxime
|
||||
alias tegra uboot, sjg, Tom Warren <twarren@nvidia.com>, Stephen Warren <swarren@nvidia.com>
|
||||
alias tegra2 tegra
|
||||
|
7
env/common.c
vendored
7
env/common.c
vendored
@ -24,10 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
#include <env_default.h>
|
||||
|
||||
struct hsearch_data env_htab = {
|
||||
#if CONFIG_IS_ENABLED(ENV_SUPPORT)
|
||||
/* defined in flags.c, only compile with ENV_SUPPORT */
|
||||
.change_ok = env_flags_validate,
|
||||
#endif
|
||||
};
|
||||
|
||||
/*
|
||||
@ -229,9 +226,7 @@ void env_relocate(void)
|
||||
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
|
||||
env_reloc();
|
||||
env_fix_drivers();
|
||||
|
||||
if (env_htab.change_ok)
|
||||
env_htab.change_ok += gd->reloc_off;
|
||||
env_htab.change_ok += gd->reloc_off;
|
||||
#endif
|
||||
if (gd->env_valid == ENV_INVALID) {
|
||||
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
|
||||
|
@ -9,11 +9,4 @@
|
||||
#ifndef _CONFIG_DEFAULTS_H_
|
||||
#define _CONFIG_DEFAULTS_H_
|
||||
|
||||
/* Support bootm-ing different OSes */
|
||||
#define CONFIG_BOOTM_LINUX 1
|
||||
#define CONFIG_BOOTM_NETBSD 1
|
||||
#define CONFIG_BOOTM_PLAN9 1
|
||||
#define CONFIG_BOOTM_RTEMS 1
|
||||
#define CONFIG_BOOTM_VXWORKS 1
|
||||
|
||||
#endif
|
||||
|
@ -13,8 +13,6 @@
|
||||
|
||||
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
||||
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define USDHC1_BASE_ADDR 0x5b010000
|
||||
#define USDHC2_BASE_ADDR 0x5b020000
|
||||
|
@ -61,11 +61,6 @@ BUR_COMMON_ENV \
|
||||
" bootm ${loadaddr} - ${dtbaddr}\0"
|
||||
#endif /* !CONFIG_SPL_BUILD*/
|
||||
|
||||
/* undefine command which we not need here */
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* Support both device trees and ATAGs. */
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
|
@ -58,11 +58,6 @@ BUR_COMMON_ENV \
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default"
|
||||
|
||||
/* undefine command which we not need here */
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* Support both device trees and ATAGs. */
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
|
@ -38,10 +38,6 @@
|
||||
#define CONFIG_POWER_PFUZE3000
|
||||
#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08
|
||||
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* I2C configs */
|
||||
#define CONFIG_SYS_I2C
|
||||
#define CONFIG_SYS_I2C_MXC
|
||||
|
@ -28,9 +28,6 @@
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 1
|
||||
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* I2C configs */
|
||||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
||||
|
@ -13,8 +13,6 @@
|
||||
|
||||
#define CONFIG_DISPLAY_BOARDINFO_LATE
|
||||
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define USDHC1_BASE_ADDR 0x5b010000
|
||||
#define USDHC2_BASE_ADDR 0x5b020000
|
||||
|
@ -35,9 +35,6 @@
|
||||
#define CONFIG_SYS_FSL_USDHC_NUM 2
|
||||
#endif
|
||||
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* I2C configs */
|
||||
#define CONFIG_SYS_I2C_MXC
|
||||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
@ -69,7 +69,6 @@
|
||||
#undef CONFIG_CMD_IMLS
|
||||
|
||||
#undef CONFIG_CMD_CRC32
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
|
||||
/* ENET Config */
|
||||
/* ENET1 */
|
||||
|
@ -45,7 +45,6 @@
|
||||
#undef CONFIG_CMD_IMLS
|
||||
|
||||
#undef CONFIG_CMD_CRC32
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define USDHC1_BASE_ADDR 0x5B010000
|
||||
|
@ -44,7 +44,6 @@
|
||||
#undef CONFIG_CMD_IMLS
|
||||
|
||||
#undef CONFIG_CMD_CRC32
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
#define USDHC1_BASE_ADDR 0x5B010000
|
||||
|
@ -30,10 +30,6 @@
|
||||
/* MMC Config*/
|
||||
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
|
||||
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_PLAN9
|
||||
#undef CONFIG_BOOTM_RTEMS
|
||||
|
||||
/* I2C configs */
|
||||
#define CONFIG_SYS_I2C_MXC
|
||||
#define CONFIG_SYS_I2C_SPEED 100000
|
||||
|
@ -217,8 +217,8 @@
|
||||
"addr_secdb_key=0xc000000\0" \
|
||||
"name_kern=zImage\0" \
|
||||
"addr_mon=0x87000000\0" \
|
||||
"addr_non_sec_mon=0x0c087fc0\0" \
|
||||
"addr_load_sec_bm=0x0c08c000\0" \
|
||||
"addr_non_sec_mon=0x0c097fc0\0" \
|
||||
"addr_load_sec_bm=0x0c09c000\0" \
|
||||
"run_mon=mon_install ${addr_mon}\0" \
|
||||
"run_mon_hs=mon_install ${addr_non_sec_mon} " \
|
||||
"${addr_load_sec_bm}\0" \
|
||||
|
@ -21,9 +21,6 @@
|
||||
#undef CONFIG_ZLIB
|
||||
#undef CONFIG_GZIP
|
||||
#undef CONFIG_CMD_ENV
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_VXWORKS
|
||||
#undef CONFIG_BOOTM_LINUX
|
||||
|
||||
/* BOOTP options */
|
||||
#undef CONFIG_BOOTP_BOOTFILESIZE
|
||||
|
@ -24,9 +24,6 @@
|
||||
#undef CONFIG_GZIP
|
||||
#undef CONFIG_CMD_ENV
|
||||
#undef CONFIG_SYS_INIT_SP_ADDR
|
||||
#undef CONFIG_BOOTM_NETBSD
|
||||
#undef CONFIG_BOOTM_VXWORKS
|
||||
#undef CONFIG_BOOTM_LINUX
|
||||
|
||||
/* BOOTP options */
|
||||
#undef CONFIG_BOOTP_BOOTFILESIZE
|
||||
|
@ -19,8 +19,6 @@
|
||||
#undef CONFIG_GZIP
|
||||
|
||||
#undef CONFIG_SYS_CBSIZE
|
||||
#undef CONFIG_BOOTM_VXWORKS
|
||||
#undef CONFIG_BOOTM_LINUX
|
||||
|
||||
#define CONFIG_SYS_CBSIZE 1024
|
||||
|
||||
|
@ -30,11 +30,13 @@ static inline int initcall_run_list(const init_fnc_t init_sequence[])
|
||||
#ifdef CONFIG_EFI_APP
|
||||
reloc_ofs = (unsigned long)image_base;
|
||||
#endif
|
||||
debug("initcall: %p", (char *)*init_fnc_ptr - reloc_ofs);
|
||||
if (reloc_ofs)
|
||||
debug(" (relocated to %p)\n", (char *)*init_fnc_ptr);
|
||||
debug("initcall: %p (relocated to %p)\n",
|
||||
(char *)*init_fnc_ptr - reloc_ofs,
|
||||
(char *)*init_fnc_ptr);
|
||||
else
|
||||
debug("\n");
|
||||
debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
|
||||
|
||||
ret = (*init_fnc_ptr)();
|
||||
if (ret) {
|
||||
printf("initcall sequence %p failed at call %p (err=%d)\n",
|
||||
|
@ -128,13 +128,6 @@ CONFIG_BOOGER
|
||||
CONFIG_BOOTBLOCK
|
||||
CONFIG_BOOTFILE
|
||||
CONFIG_BOOTMODE
|
||||
CONFIG_BOOTM_LINUX
|
||||
CONFIG_BOOTM_NETBSD
|
||||
CONFIG_BOOTM_OPENRTOS
|
||||
CONFIG_BOOTM_OSE
|
||||
CONFIG_BOOTM_PLAN9
|
||||
CONFIG_BOOTM_RTEMS
|
||||
CONFIG_BOOTM_VXWORKS
|
||||
CONFIG_BOOTP_
|
||||
CONFIG_BOOTP_BOOTFILE
|
||||
CONFIG_BOOTP_BOOTFILESIZE
|
||||
|
Loading…
Reference in New Issue
Block a user