On Tuesday, September 06, 2011 22:27:15 Macpaul Lin wrote:
--- a/Makefile +++ b/Makefile @@ -936,7 +936,8 @@ clean: $(obj)board/voiceblue/eeprom \ $(obj)u-boot.lds \ $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs] \
$(obj)arch/blackfin/cpu/init.{lds,elf}
$(obj)arch/blackfin/cpu/init.{lds,elf} \$(obj)arch/nds32/cpu/$(CPU)/$(SOC)/gen-asm-offsets.[chs]
i think the recently merged asm-offsets unification patch takes care of this for you, so you can drop this change
--- /dev/null +++ b/arch/nds32/cpu/n1213/ag101/Makefile
+ifndef CONFIG_SKIP_LOWLEVEL_INIT +SOBJS := lowlevel_init.o +endif
+ifndef CONFIG_SKIP_TRUNOFF_WATCHDOG +SOBJS += watchdog.o +endif
the CONFIG_SKIP_xxx is a bit backwards. seems like you should invert the logic, have your arch asm/config.h define them by default, and then have the boards which want to skip it do an #undef on them.
otherwise, you can unify this with: SOBJS- := SOBJS-$(CONFIG_SKIP_LOWLEVEL_INIT) += lowlevel_init.o SOBJS-$(CONFIG_SKIP_TRUNOFF_WATCHDOG) += watchdog.o
and then use $(SOBJS-) ...
+$(OBJS): $(obj)gen-asm-offsets.h +$(obj)gen-asm-offsets.h: $(TOPDIR)/include/autoconf.mk.dep \
- $(obj)gen-asm-offsets.s
- @echo Generating $@ ; \
- $(SRCTREE)/tools/scripts/make-asm-offsets $(obj)gen-asm-offsets.s $@
+$(obj)gen-asm-offsets.s: $(TOPDIR)/include/autoconf.mk.dep \
- $(src)asm-offsets.c
- @mkdir -p $(obj)b
- $(CC) -DDO_DEPS_ONLY \
$(CFLAGS) -o $@ $(src)asm-offsets.c -c -S
pretty sure the recent unification of this in the top level Makefile means you can drop this now -mike