EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a debug statement from trx.c, add config changes for at91

Browse Source 
SVN-Revision: 7491
This commit is contained in:
Hamish Guthrie 2007-06-04 17:39:38 +00:00
parent 9114220553
commit e970f61273
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules.mk
View File

@ -84,7 +84,8 @@ TARGET_CONFIGURE_OPTS:= \
RANLIB=$(TARGET_CROSS)ranlib \ RANLIB=$(TARGET_CROSS)ranlib \
STRIP=$(TARGET_CROSS)strip \ STRIP=$(TARGET_CROSS)strip \
OBJCOPY=$(TARGET_CROSS)objcopy \ OBJCOPY=$(TARGET_CROSS)objcopy \
OBJDUMP=$(TARGET_CROSS)objdump OBJDUMP=$(TARGET_CROSS)objdump \
SIZE=$(TARGET_CROSS)size
# strip an entire directory # strip an entire directory
RSTRIP:= \ RSTRIP:= \

3
target/linux/at91-2.6/base-files/default/etc/inittab
View File

@ -1,4 +1,5 @@
::sysinit:/etc/init.d/rcS ::sysinit:/etc/init.d/rcS S boot
::shutdown:/etc/init.d/rcS K stop
tts/0::askfirst:/bin/ash --login tts/0::askfirst:/bin/ash --login
ttyS0::askfirst:/bin/ash --login ttyS0::askfirst:/bin/ash --login

5
target/linux/at91-2.6/image/Config.in
View File

@ -3,6 +3,11 @@ config AT91_ROMBOOT
depends LINUX_2_6_AT91 depends LINUX_2_6_AT91
default y default y
config AT91_DFBOOT
bool "Build dataflashboot loader"
depends LINUX_2_6_AT91
default y
config AT91_UBOOT config AT91_UBOOT
bool "Build u-boot loader" bool "Build u-boot loader"
depends LINUX_2_6_AT91 depends LINUX_2_6_AT91

15
target/linux/at91-2.6/image/Makefile
View File

@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
define Build/Clean define Build/Clean
$(MAKE) -C romboot clean # $(MAKE) -C romboot clean
$(MAKE) -C dfboot clean
$(MAKE) -C u-boot clean $(MAKE) -C u-boot clean
endef endef
define Build/Compile define Build/Compile
$(MAKE) -C romboot compile # $(MAKE) -C romboot compile
# $(MAKE) -C u-boot configure $(MAKE) -C dfboot compile
$(MAKE) -C u-boot compile $(MAKE) -C u-boot compile
$(KDIR)/u-boot-1.1.4/tools/ubparams $(KDIR)/u-boot-1.1.4/tools/ubparams
cp params $(KDIR) cp params $(KDIR)
@ -23,8 +24,8 @@ endef
define Image/Prepare define Image/Prepare
cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
cp $(KDIR)/romboot/romboot.bin $(KDIR)/romboot.bin cp $(KDIR)/dfboot/dfboot.bin $(KDIR)/dfboot.bin
cp $(KDIR)/romboot/rbptest.bin $(KDIR)/rbptest.bin cp $(KDIR)/dfboot/dfbptest.bin $(KDIR)/dfbptest.bin
cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin cp $(KDIR)/u-boot-1.1.4/u-boot.bin $(KDIR)/u-boot.bin
dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync dd if=$(KDIR)/u-boot.bin of=$(KDIR)/u-boot.block bs=100k count=1 conv=sync
cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full cat $(KDIR)/u-boot.block $(KDIR)/params > $(KDIR)/u-boot.full
@ -38,8 +39,8 @@ define Image/Build
dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync dd if=$(KDIR)/uImage of=$(KDIR)/uImage.block bs=8448 conv=sync
dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.block bs=8448 conv=sync
cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin cat $(KDIR)/uImage.block $(KDIR)/root.block > $(KDIR)/knlroot.bin
$(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).trx -f $(KDIR)/romboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin $(STAGING_DIR)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).trx -f $(KDIR)/dfboot.bin -f$(KDIR)/u-boot.full -f$(KDIR)/knlroot.bin
cp $(KDIR)/rbptest.bin $(BIN_DIR) cp $(KDIR)/dfbptest.bin $(BIN_DIR)
$(call Image/Build/$(1),$(1)) $(call Image/Build/$(1),$(1))
endef endef

1
tools/firmware-utils/src/trx.c
View File

@ -231,7 +231,6 @@ int main(int argc, char **argv)
fclose(out); fclose(out);
printf("Offsets:\n0x%08x\n0x%08x\n0x%08x\n", p->offsets[0], p->offsets[1], p->offsets[2]);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }