leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: use CONFIG_SUPPORT_PASSING_ATAGS

Browse Source 
Simplify the bootm and the spl code by using the new config
CONFIG_SUPPORT_PASSING_ATAGS.

Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Patrick Delaunay 2021-09-03 10:24:39 +02:00 committed by Tom Rini
parent 7d1fcaea12
commit 6493fa4c3d
4 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/include/asm/bootm.h
View File

@ -10,11 +10,7 @@
extern void udc_disconnect(void); extern void udc_disconnect(void);
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
# define BOOTM_ENABLE_TAGS 1 # define BOOTM_ENABLE_TAGS 1
#else #else
# define BOOTM_ENABLE_TAGS 0 # define BOOTM_ENABLE_TAGS 0

6
arch/nds32/include/asm/bootm.h
View File

@ -12,11 +12,7 @@
extern void udc_disconnect(void); extern void udc_disconnect(void);
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
# define BOOTM_ENABLE_TAGS 1 # define BOOTM_ENABLE_TAGS 1
#else #else
# define BOOTM_ENABLE_TAGS 0 # define BOOTM_ENABLE_TAGS 0

22
arch/nds32/lib/bootm.c
View File

@ -19,11 +19,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
static void setup_start_tag(struct bd_info *bd); static void setup_start_tag(struct bd_info *bd);
# ifdef CONFIG_SETUP_MEMORY_TAGS # ifdef CONFIG_SETUP_MEMORY_TAGS
@ -38,7 +34,7 @@ static void setup_initrd_tag(struct bd_info *bd, ulong initrd_start,
static void setup_end_tag(struct bd_info *bd); static void setup_end_tag(struct bd_info *bd);
static struct tag *params; static struct tag *params;
#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */ #endif /* CONFIG_SUPPORT_PASSING_ATAGS */
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{ {
@ -82,11 +78,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
} }
#endif #endif
} else if (BOOTM_ENABLE_TAGS) { } else if (BOOTM_ENABLE_TAGS) {
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
setup_start_tag(bd); setup_start_tag(bd);
#ifdef CONFIG_SERIAL_TAG #ifdef CONFIG_SERIAL_TAG
setup_serial_tag(&params); setup_serial_tag(&params);
@ -127,11 +119,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
return 1; return 1;
} }
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
static void setup_start_tag(struct bd_info *bd) static void setup_start_tag(struct bd_info *bd)
{ {
params = (struct tag *)bd->bi_boot_params; params = (struct tag *)bd->bi_boot_params;
@ -244,7 +232,7 @@ static void setup_end_tag(struct bd_info *bd)
params->hdr.size = 0; params->hdr.size = 0;
} }
#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */ #endif /* CONFIG_SUPPORT_PASSING_ATAGS */
static ulong get_sp(void) static ulong get_sp(void)
{ {

6
cmd/spl.c
View File

@ -32,11 +32,7 @@ static const char **subcmd_list[] = {
NULL, NULL,
}, },
[SPL_EXPORT_ATAGS] = (const char * []) { [SPL_EXPORT_ATAGS] = (const char * []) {
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \ #ifdef CONFIG_SUPPORT_PASSING_ATAGS
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
"start", "start",
"loados", "loados",
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH