[ppc40x] increase linux partition size, and fix jffs2 images

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16906 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2009-07-19 06:42:30 +00:00
parent e3761b6ac5
commit e522758bed
5 changed files with 22 additions and 19 deletions

View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
JFFS2_BLOCKSIZE=128k JFFS2_BLOCKSIZE=128k 64k
define Image/Prepare define Image/Prepare
cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage cp $(LINUX_DIR)/arch/powerpc/boot/uImage $(KDIR)/uImage
@ -28,13 +28,16 @@ define Image/Build/jffs2-128k
dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \ dd if=$(KDIR)/openwrt-kilauea.dtb bs=128k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-jffs2.img ) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-jffs2.img
endef
define Image/Build/jffs2-64k
( \ ( \
dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1024k conv=sync; \ dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-jffs2.img ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-jffs2.img
( \ ( \
dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1024k conv=sync; \ dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-jffs2.img ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-jffs2.img
endef endef
@ -46,11 +49,11 @@ define Image/Build/squashfs
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-$(1).img ) > $(BIN_DIR)/openwrt-$(BOARD)-kilauea-$(1).img
( \ ( \
dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1024k conv=sync; \ dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv1 bs=1152k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-$(1).img ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv1-$(1).img
( \ ( \
dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1024k conv=sync; \ dd if=$(LINUX_DIR)/arch/powerpc/boot/cuImage.magicboxv2 bs=1152k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-$(1).img ) > $(BIN_DIR)/openwrt-$(BOARD)-magicboxv2-$(1).img
endef endef

View File

@ -204,11 +204,11 @@
+ #size-cells = <1>; + #size-cells = <1>;
+ partition@0 { + partition@0 {
+ label = "linux"; + label = "linux";
+ reg = <0x0 0x3c0000>; + reg = <0x0 0x120000>;
+ }; + };
+ partition@100000 { + partition@120000 {
+ label = "rootfs"; + label = "rootfs";
+ reg = <0x100000 0x2c0000>; + reg = <0x120000 0x2a0000>;
+ }; + };
+ partition@3c0000 { + partition@3c0000 {
+ label = "u-boot"; + label = "u-boot";

View File

@ -238,11 +238,11 @@
+ #size-cells = <1>; + #size-cells = <1>;
+ partition@0 { + partition@0 {
+ label = "linux"; + label = "linux";
+ reg = <0x0 0x3c0000>; + reg = <0x0 0x120000>;
+ }; + };
+ partition@100000 { + partition@120000 {
+ label = "rootfs"; + label = "rootfs";
+ reg = <0x100000 0x2c0000>; + reg = <0x120000 0x2a0000>;
+ }; + };
+ partition@3c0000 { + partition@3c0000 {
+ label = "u-boot"; + label = "u-boot";

View File

@ -203,11 +203,11 @@
+ #size-cells = <1>; + #size-cells = <1>;
+ partition@0 { + partition@0 {
+ label = "linux"; + label = "linux";
+ reg = <0x0 0x3c0000>; + reg = <0x0 0x120000>;
+ }; + };
+ partition@100000 { + partition@120000 {
+ label = "rootfs"; + label = "rootfs";
+ reg = <0x100000 0x2c0000>; + reg = <0x120000 0x2a0000>;
+ }; + };
+ partition@3c0000 { + partition@3c0000 {
+ label = "u-boot"; + label = "u-boot";

View File

@ -237,11 +237,11 @@
+ #size-cells = <1>; + #size-cells = <1>;
+ partition@0 { + partition@0 {
+ label = "linux"; + label = "linux";
+ reg = <0x0 0x3c0000>; + reg = <0x0 0x120000>;
+ }; + };
+ partition@100000 { + partition@120000 {
+ label = "rootfs"; + label = "rootfs";
+ reg = <0x100000 0x2c0000>; + reg = <0x120000 0x2a0000>;
+ }; + };
+ partition@3c0000 { + partition@3c0000 {
+ label = "u-boot"; + label = "u-boot";