| Message ID | 1463273377-11235-7-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 1c29a382e13af1471282ebff3a74afabea5b8ff8 |
| Delegated to: | Tom Rini |
| Headers | show |
On 2016-05-15 02:49, Simon Glass wrote: > Since generic board init is enabled, this is not used. Drop it. > > Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Andreas Bießmann <andreas@biessmann.org> > --- > > arch/avr32/include/asm/u-boot.h | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/arch/avr32/include/asm/u-boot.h > b/arch/avr32/include/asm/u-boot.h > index 8b047ec..7d48e9a 100644 > --- a/arch/avr32/include/asm/u-boot.h > +++ b/arch/avr32/include/asm/u-boot.h > @@ -6,28 +6,8 @@ > #ifndef __ASM_U_BOOT_H__ > #define __ASM_U_BOOT_H__ 1 > > -#ifdef CONFIG_SYS_GENERIC_BOARD > /* Use the generic board which requires a unified bd_info */ > #include <asm-generic/u-boot.h> > -#else > - > -typedef struct bd_info { > - unsigned char bi_phy_id[4]; > - unsigned long bi_board_number; > - void *bi_boot_params; > - struct { > - unsigned long start; > - unsigned long size; > - } bi_dram[CONFIG_NR_DRAM_BANKS]; > - unsigned long bi_flashstart; > - unsigned long bi_flashsize; > - unsigned long bi_flashoffset; > -} bd_t; > - > -#define bi_memstart bi_dram[0].start > -#define bi_memsize bi_dram[0].size > - > -#endif > > /* For image.h:image_check_target_arch() */ > #define IH_ARCH_DEFAULT IH_ARCH_AVR32
On Sat, May 14, 2016 at 06:49:31PM -0600, Simon Glass wrote: > Since generic board init is enabled, this is not used. Drop it. > > Signed-off-by: Simon Glass <sjg@chromium.org> > Acked-by: Andreas Bießmann <andreas@biessmann.org> Applied to u-boot/master, thanks!
diff --git a/arch/avr32/include/asm/u-boot.h b/arch/avr32/include/asm/u-boot.h index 8b047ec..7d48e9a 100644 --- a/arch/avr32/include/asm/u-boot.h +++ b/arch/avr32/include/asm/u-boot.h @@ -6,28 +6,8 @@ #ifndef __ASM_U_BOOT_H__ #define __ASM_U_BOOT_H__ 1 -#ifdef CONFIG_SYS_GENERIC_BOARD /* Use the generic board which requires a unified bd_info */ #include <asm-generic/u-boot.h> -#else - -typedef struct bd_info { - unsigned char bi_phy_id[4]; - unsigned long bi_board_number; - void *bi_boot_params; - struct { - unsigned long start; - unsigned long size; - } bi_dram[CONFIG_NR_DRAM_BANKS]; - unsigned long bi_flashstart; - unsigned long bi_flashsize; - unsigned long bi_flashoffset; -} bd_t; - -#define bi_memstart bi_dram[0].start -#define bi_memsize bi_dram[0].size - -#endif /* For image.h:image_check_target_arch() */ #define IH_ARCH_DEFAULT IH_ARCH_AVR32
Since generic board init is enabled, this is not used. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/avr32/include/asm/u-boot.h | 20 -------------------- 1 file changed, 20 deletions(-)