V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: Remove some unnecessary #ifdefs 

We always define CONFIG_MISC_INIT_R on sunxi and misc_init_r is never
called in the spl, so the linker will optimize it and parse_spl_header(),
of which it is the only caller, away.

On the tests I've done (Orange Pi PC build) the SPL actually becomes
8 bytes smaller with this patch.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2016-07-09 09:56:56 +02:00
parent f221961e96
commit 4a8c7c1f45
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
board/sunxi/board.c
View File

@ -20,12 +20,14 @@
#include <asm/arch/dram.h> #include <asm/arch/dram.h>
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#include <asm/arch/mmc.h> #include <asm/arch/mmc.h>
#include <asm/arch/spl.h>
#include <asm/arch/usb_phy.h> #include <asm/arch/usb_phy.h>
#ifndef CONFIG_ARM64 #ifndef CONFIG_ARM64
#include <asm/armv7.h> #include <asm/armv7.h>
#endif #endif
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <environment.h>
#include <libfdt.h> #include <libfdt.h>
#include <nand.h> #include <nand.h>
#include <net.h> #include <net.h>
@ -572,10 +574,6 @@ void get_board_serial(struct tag_serialnr *serialnr)
} }
#endif #endif
#if !defined(CONFIG_SPL_BUILD)
#include <asm/arch/spl.h>
#include <environment.h>
/* /*
* Check the SPL header for the "sunxi" variant. If found: parse values * Check the SPL header for the "sunxi" variant. If found: parse values
* that might have been passed by the loader ("fel" utility), and update * that might have been passed by the loader ("fel" utility), and update
@ -608,7 +606,6 @@ static void parse_spl_header(const uint32_t spl_addr)
/* otherwise assume .scr format (mkimage-type script) */ /* otherwise assume .scr format (mkimage-type script) */
setenv_hex("fel_scriptaddr", spl->fel_script_address); setenv_hex("fel_scriptaddr", spl->fel_script_address);
} }
#endif
/* /*
* Note this function gets called multiple times. * Note this function gets called multiple times.
@ -657,12 +654,10 @@ static void setup_environment(const void *fdt)
} }
} }
#ifdef CONFIG_MISC_INIT_R
int misc_init_r(void) int misc_init_r(void)
{ {
__maybe_unused int ret; __maybe_unused int ret;
#if !defined(CONFIG_SPL_BUILD)
setenv("fel_booted", NULL); setenv("fel_booted", NULL);
setenv("fel_scriptaddr", NULL); setenv("fel_scriptaddr", NULL);
/* determine if we are running in FEL mode */ /* determine if we are running in FEL mode */
@ -670,7 +665,6 @@ int misc_init_r(void)
setenv("fel_booted", "1"); setenv("fel_booted", "1");
parse_spl_header(SPL_ADDR); parse_spl_header(SPL_ADDR);
} }
#endif
setup_environment(gd->fdt_blob); setup_environment(gd->fdt_blob);
@ -683,7 +677,6 @@ int misc_init_r(void)
return 0; return 0;
} }
#endif
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {