diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ar71xx/image/tiny.mk | 9 | ||||
| -rw-r--r-- | target/linux/ath79/base-files/lib/upgrade/platform.sh | 4 | ||||
| -rw-r--r-- | target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts (renamed from target/linux/ath79/dts/qca9558_buffalo_bhr-4grv2.dts) | 11 | ||||
| -rw-r--r-- | target/linux/ath79/image/generic.mk | 7 | ||||
| -rw-r--r-- | target/linux/ath79/image/tiny.mk | 19 |
5 files changed, 19 insertions, 31 deletions
diff --git a/target/linux/ar71xx/image/tiny.mk b/target/linux/ar71xx/image/tiny.mk index aabe68c2b9..b318d81537 100644 --- a/target/linux/ar71xx/image/tiny.mk +++ b/target/linux/ar71xx/image/tiny.mk @@ -1,3 +1,12 @@ +define Build/mkbuffaloimg + $(STAGING_DIR_HOST)/bin/mkbuffaloimg -B $(BOARDNAME) \ + -R $$(($(subst k, * 1024,$(ROOTFS_SIZE)))) \ + -K $$(($(subst k, * 1024,$(KERNEL_SIZE)))) \ + -i $@ -o $@.new + mv $@.new $@ +endef + + define Device/bhr-4grv2 DEVICE_TITLE := Buffalo BHR-4GRV2 BOARDNAME := BHR-4GRV2 diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh index 806b3f0787..a7cb455b8e 100644 --- a/target/linux/ath79/base-files/lib/upgrade/platform.sh +++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh @@ -22,10 +22,6 @@ platform_do_upgrade() { local board=$(board_name) case "$board" in - buffalo,bhr-4grv2) - PART_NAME="rootfs:kernel" - default_do_upgrade "$ARGV" - ;; ubnt,routerstation|\ ubnt,routerstation-pro) routerstation_do_upgrade "$ARGV" diff --git a/target/linux/ath79/dts/qca9558_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts index e2611e5bf0..6a3a5da6d6 100644 --- a/target/linux/ath79/dts/qca9558_buffalo_bhr-4grv2.dts +++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts @@ -93,17 +93,12 @@ partition@40000 { label = "u-boot-env"; reg = <0x040000 0x010000>; - read-only; }; partition@50000 { - label = "rootfs"; - reg = <0x050000 0xe30000>; - }; - - partition@e80000 { - label = "kernel"; - reg = <0xe80000 0x170000>; + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x050000 0xfa0000>; }; art: partition@ff0000 { diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 3dbed22924..9bdd8f6e35 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -82,6 +82,13 @@ define Device/buffalo_bhr-4grv endef TARGET_DEVICES += buffalo_bhr-4grv +define Device/buffalo_bhr-4grv2 + ATH_SOC := qca9557 + DEVICE_TITLE := Buffalo BHR-4GRV2 + IMAGE_SIZE := 16000k +endef +TARGET_DEVICES += buffalo_bhr-4grv2 + define Device/buffalo_wzr-hp-ag300h ATH_SOC := ar7161 DEVICE_TITLE := Buffalo WZR-HP-AG300H diff --git a/target/linux/ath79/image/tiny.mk b/target/linux/ath79/image/tiny.mk index 4dda24edac..bf7a5e140b 100644 --- a/target/linux/ath79/image/tiny.mk +++ b/target/linux/ath79/image/tiny.mk @@ -1,24 +1,5 @@ include ./common-buffalo.mk -DEVICE_VARS += ROOTFS_SIZE - -define Device/buffalo_bhr-4grv2 - ATH_SOC := qca9558 - DEVICE_TITLE := Buffalo BHR-4GRV2 - BOARDNAME := BHR-4GRV2 - ROOTFS_SIZE := 14528k - KERNEL_SIZE := 1472k - IMAGE_SIZE := 16000k - IMAGES += factory.bin - IMAGE/sysupgrade.bin := \ - append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | \ - append-kernel | append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := append-kernel | \ - pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | mkbuffaloimg - SUPPORTED_DEVICES += bhr-4grv2 -endef -TARGET_DEVICES += buffalo_bhr-4grv2 - define Device/buffalo_whr-g301n ATH_SOC := ar7240 DEVICE_TITLE := Buffalo WHR-G301N |