aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGiuseppe Lippolis <giu.lippolis@gmail.com>2018-04-05 18:01:41 +0200
committerMathias Kresin <dev@kresin.me>2018-04-08 09:51:06 +0200
commit1680ae7eae2602dd85463a71f88d0012b236bff7 (patch)
tree540925cfcf39b4ee4efa9bdc98e7e00beff5e4f2 /target/linux
parentcb7ac151cd13ca510588b80c24645f2add1b3737 (diff)
downloadupstream-1680ae7eae2602dd85463a71f88d0012b236bff7.tar.gz
upstream-1680ae7eae2602dd85463a71f88d0012b236bff7.tar.bz2
upstream-1680ae7eae2602dd85463a71f88d0012b236bff7.zip
ramips: add dwr-512 jboot firmware configuration
The previous fw version require the replacement of the stock bootloader with u-boot. This prevent an easy stock restore of the original fw. Now a proper fw util has been developed to manage the stock jboot bootloader. Therefore make sense have a fw image for the stock bootloader. The old fw configuration (u-boot) is not compatible with the new one and will not be supported anymore. So at the end 2 image can be generated: 1) factory image with jboot bootloader openwrt-ramips-rt305x-dwr-512-b-squashfs-factory.bin 2) sysupgrade image with jboot bootloader openwrt-ramips-rt305x-dwr-512-b-squashfs-sysupgrade.bin Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
Diffstat (limited to 'target/linux')
-rwxr-xr-xtarget/linux/ramips/base-files/lib/upgrade/platform.sh4
-rw-r--r--target/linux/ramips/dts/DWR-512-B.dts14
-rw-r--r--target/linux/ramips/image/rt305x.mk14
-rw-r--r--target/linux/ramips/rt305x/config-4.141
-rw-r--r--target/linux/ramips/rt3883/config-4.141
5 files changed, 19 insertions, 15 deletions
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 44be484374..c58102cf4e 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -52,7 +52,6 @@ platform_check_image() {
dir-620-d1|\
dir-810l|\
duzun-dm06|\
- dwr-512-b|\
e1700|\
esr-9753|\
ew1200|\
@@ -272,7 +271,8 @@ platform_check_image() {
return 0
;;
dlink,dwr-116-a1|\
- dlink,dwr-921-c1)
+ dlink,dwr-921-c1|\
+ dwr-512-b)
[ "$magic" != "0404242b" ] && {
echo "Invalid image type."
return 1
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts
index afcac21c6c..74a33e10e4 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/DWR-512-B.dts
@@ -85,20 +85,14 @@
m25p,fast-read;
partition@0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
+ label = "jboot";
+ reg = <0x0 0x10000>;
read-only;
};
- partition@30000 {
- label = "u-boot-env";
- reg = <0x30000 0x20000>;
- read-only;
- };
-
- partition@50000 {
+ partition@10000 {
label = "firmware";
- reg = <0x50000 0x7a0000>;
+ reg = <0x10000 0x7e0000>;
};
config: partition@7f0000 {
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index dbf15bc7d7..5a4ca73517 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -302,10 +302,18 @@ TARGET_DEVICES += dir-620-d1
define Device/dwr-512-b
DTS := DWR-512-B
- IMAGE_SIZE := 7700k
+ IMAGE_SIZE := 7800k
DEVICE_TITLE := D-Link DWR-512 B
- DEVICE_PACKAGES := kmod-usb2 kmod-spi-dev kmod-usb-serial kmod-usb-serial-option \
- kmod-usb-net kmod-usb-net-cdc-ether comgt-ncm
+ DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \
+ kmod-usb-serial-option kmod-usb-net kmod-usb-net-cdc-ether \
+ comgt-ncm
+ DLINK_ROM_ID := DLK6E2412001
+ DLINK_FAMILY_MEMBER := 0x6E24
+ DLINK_FIRMWARE_SIZE := 0x7E0000
+ KERNEL := $(KERNEL_DTB)
+ IMAGES += factory.bin
+ IMAGE/sysupgrade.bin := mkdlinkfw | pad-rootfs | append-metadata
+ IMAGE/factory.bin := mkdlinkfw | pad-rootfs | mkdlinkfw-factory
endef
TARGET_DEVICES += dwr-512-b
diff --git a/target/linux/ramips/rt305x/config-4.14 b/target/linux/ramips/rt305x/config-4.14
index 33be3910a9..dadf88e032 100644
--- a/target/linux/ramips/rt305x/config-4.14
+++ b/target/linux/ramips/rt305x/config-4.14
@@ -138,6 +138,7 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_JIMAGE_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_NEED_DMA_MAP_STATE=y
diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14
index 6a0386fa47..0c0a840c39 100644
--- a/target/linux/ramips/rt3883/config-4.14
+++ b/target/linux/ramips/rt3883/config-4.14
@@ -158,6 +158,7 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_JIMAGE_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_NEED_DMA_MAP_STATE=y