| Message ID | 1311834990-21831-1-git-send-email-chander.kashyap@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
Dear Chander Kashyap, On 28 July 2011 15:36, Chander Kashyap <chander.kashyap@linaro.org> wrote: > Removed dummy functions in "mmc_spl/board/samsung/smdkv310/mmc_boot.c", > @mmc_boot.c > void do_undefined_instruction(struct pt_regs *pt_regs); > void do_software_interrupt(struct pt_regs *pt_regs); > void do_prefetch_abort(struct pt_regs *pt_regs); > void do_data_abort(struct pt_regs *pt_regs); > void do_not_used(struct pt_regs *pt_regs); > void do_fiq(struct pt_regs *pt_regs); > void do_irq(struct pt_regs *pt_regs); > > not required as called conditionally in start.S > @start.S > \#ifdef CONFIG_SPL_BUILD > _undefined_instruction: .word _undefined_instruction > _software_interrupt: .word _software_interrupt > _prefetch_abort: .word _prefetch_abort > _data_abort: .word _data_abort > _not_used: .word _not_used > _irq: .word _irq > _fiq: .word _fiq > _pad: .word 0x12345678 /* now 16*4=64 */ > \#else > _undefined_instruction: .word undefined_instruction > _software_interrupt: .word software_interrupt > _prefetch_abort: .word prefetch_abort > _data_abort: .word data_abort > _not_used: .word not_used > _irq: .word irq > _fiq: .word fiq > _pad: .word 0x12345678 /* now 16*4=64 */ > \#endif > e.g. > undefined_instruction: > get_bad_stack > bad_save_user_regs > bl do_undefined_instruction > > Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> > --- > mmc_spl/board/samsung/smdkv310/Makefile | 1 + > mmc_spl/board/samsung/smdkv310/mmc_boot.c | 30 ----------------------------- > 2 files changed, 1 insertions(+), 30 deletions(-) > applied to u-boot-samsung Thanks Minkyu Kang
diff --git a/mmc_spl/board/samsung/smdkv310/Makefile b/mmc_spl/board/samsung/smdkv310/Makefile index de2c1a2..1589f28 100644 --- a/mmc_spl/board/samsung/smdkv310/Makefile +++ b/mmc_spl/board/samsung/smdkv310/Makefile @@ -34,6 +34,7 @@ include $(TOPDIR)/config.mk LDSCRIPT= $(TOPDIR)/mmc_spl/board/$(BOARDDIR)/u-boot.lds LDFLAGS = -Bstatic -T $(mmcobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_MMC_SPL +AFLAGS += -DCONFIG_SPL_BUILD CFLAGS += -DCONFIG_MMC_SPL CFLAGS += -DCONFIG_SPL_BUILD diff --git a/mmc_spl/board/samsung/smdkv310/mmc_boot.c b/mmc_spl/board/samsung/smdkv310/mmc_boot.c index dea1b86..2f3e463 100644 --- a/mmc_spl/board/samsung/smdkv310/mmc_boot.c +++ b/mmc_spl/board/samsung/smdkv310/mmc_boot.c @@ -57,33 +57,3 @@ void board_init_r(gd_t *id, ulong dest_addr) void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) { } - -void do_undefined_instruction(struct pt_regs *pt_regs) -{ -} - -void do_software_interrupt(struct pt_regs *pt_regs) -{ -} - -void do_prefetch_abort(struct pt_regs *pt_regs) -{ -} - -void do_data_abort(struct pt_regs *pt_regs) -{ -} - -void do_not_used(struct pt_regs *pt_regs) -{ -} - -void do_fiq(struct pt_regs *pt_regs) -{ -} - -#ifndef CONFIG_USE_IRQ -void do_irq(struct pt_regs *pt_regs) -{ -} -#endif
Removed dummy functions in "mmc_spl/board/samsung/smdkv310/mmc_boot.c", @mmc_boot.c void do_undefined_instruction(struct pt_regs *pt_regs); void do_software_interrupt(struct pt_regs *pt_regs); void do_prefetch_abort(struct pt_regs *pt_regs); void do_data_abort(struct pt_regs *pt_regs); void do_not_used(struct pt_regs *pt_regs); void do_fiq(struct pt_regs *pt_regs); void do_irq(struct pt_regs *pt_regs); not required as called conditionally in start.S @start.S \#ifdef CONFIG_SPL_BUILD _undefined_instruction: .word _undefined_instruction _software_interrupt: .word _software_interrupt _prefetch_abort: .word _prefetch_abort _data_abort: .word _data_abort _not_used: .word _not_used _irq: .word _irq _fiq: .word _fiq _pad: .word 0x12345678 /* now 16*4=64 */ \#else _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort _data_abort: .word data_abort _not_used: .word not_used _irq: .word irq _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ \#endif e.g. undefined_instruction: get_bad_stack bad_save_user_regs bl do_undefined_instruction Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org> --- mmc_spl/board/samsung/smdkv310/Makefile | 1 + mmc_spl/board/samsung/smdkv310/mmc_boot.c | 30 ----------------------------- 2 files changed, 1 insertions(+), 30 deletions(-)