summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/config_defaults.h7
-rw-r--r--include/configs/apalis-imx8.h2
-rw-r--r--include/configs/brsmarc1.h5
-rw-r--r--include/configs/brxre1.h5
-rw-r--r--include/configs/cl-som-imx7.h4
-rw-r--r--include/configs/colibri-imx6ull.h3
-rw-r--r--include/configs/colibri-imx8x.h2
-rw-r--r--include/configs/colibri_imx7.h3
-rw-r--r--include/configs/imx8mq_evk.h1
-rw-r--r--include/configs/imx8qm_mek.h1
-rw-r--r--include/configs/imx8qxp_mek.h1
-rw-r--r--include/configs/mx7dsabresd.h4
-rw-r--r--include/configs/ti_armv7_keystone2.h4
-rw-r--r--include/configs/xilinx_versal_mini.h3
-rw-r--r--include/configs/xilinx_zynqmp_mini.h3
-rw-r--r--include/configs/zynq_cse.h2
-rw-r--r--include/initcall.h8
17 files changed, 7 insertions, 51 deletions
diff --git a/include/config_defaults.h b/include/config_defaults.h
index 4ed09683b6..d211a41ef2 100644
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -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
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 6eb8395162..3a8d2d40d7 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -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
diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h
index c3eb5baacc..19e796edb1 100644
--- a/include/configs/brsmarc1.h
+++ b/include/configs/brsmarc1.h
@@ -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
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h
index 7309e7d483..c6e308b04d 100644
--- a/include/configs/brxre1.h
+++ b/include/configs/brxre1.h
@@ -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
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 7f3fdea039..67c52d76e7 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -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
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 736717486b..0a4f30fbaf 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -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
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 6f3c34d1ad..69a876fee3 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -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
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 49cdd61038..4677e09b47 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -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
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c2113439c3..1ceec5ab5a 100644
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -69,7 +69,6 @@
#undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_CRC32
-#undef CONFIG_BOOTM_NETBSD
/* ENET Config */
/* ENET1 */
diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index 5a9fd57060..7a790ef158 100644
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -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
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 02c4e9f8f6..c357c7bbe6 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -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
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 77856a8f3a..e1f92da48c 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -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
diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h
index d7bb1efcbf..ba12428dbe 100644
--- a/include/configs/ti_armv7_keystone2.h
+++ b/include/configs/ti_armv7_keystone2.h
@@ -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" \
diff --git a/include/configs/xilinx_versal_mini.h b/include/configs/xilinx_versal_mini.h
index 4b3691b407..d30a697a57 100644
--- a/include/configs/xilinx_versal_mini.h
+++ b/include/configs/xilinx_versal_mini.h
@@ -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
diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h
index 7138851dae..a6922896e0 100644
--- a/include/configs/xilinx_zynqmp_mini.h
+++ b/include/configs/xilinx_zynqmp_mini.h
@@ -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
diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index daf7d75d30..917f35b24c 100644
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -19,8 +19,6 @@
#undef CONFIG_GZIP
#undef CONFIG_SYS_CBSIZE
-#undef CONFIG_BOOTM_VXWORKS
-#undef CONFIG_BOOTM_LINUX
#define CONFIG_SYS_CBSIZE 1024
diff --git a/include/initcall.h b/include/initcall.h
index 78d15afe69..b5acdd01bd 100644
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -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",
View Lorry Controller Status