Use different names for flash size related board variants, to make sure
that only images for the actual flash size are considered as valid by
the image validation code.
Remove the flash size suffix from the string returned by
ramips_board_detect() to ensure that existing scripts relying on the
former used boardname are still working.
Signed-off-by: Mathias Kresin <dev@kresin.me>
14 files changed:
*"AR725W")
name="ar725w"
;;
*"AR725W")
name="ar725w"
;;
- *"ASL26555")
- name="asl26555"
+ *"ASL26555 (8M)")
+ name="asl26555-8M"
+ ;;
+ *"ASL26555 (16M)")
+ name="asl26555-16M"
;;
*"ATP-52B")
name="atp-52b"
;;
*"ATP-52B")
name="atp-52b"
*"NCS601W")
name="ncs601w"
;;
*"NCS601W")
name="ncs601w"
;;
- *"NixcoreX1")
- name="nixcore-x1"
+ *"NixcoreX1 (8M)")
+ name="nixcore-x1-8M"
+ ;;
+ *"NixcoreX1 (16M)")
+ name="nixcore-x1-16M"
;;
*"NW718")
name="nw718"
;;
*"NW718")
name="nw718"
*"V22RW-2X2")
name="v22rw-2x2"
;;
*"V22RW-2X2")
name="v22rw-2x2"
;;
- *"VoCore")
- name="vocore"
+ *"VoCore (8M)")
+ name="vocore-8M"
+ ;;
+ *"VoCore (16M)")
+ name="vocore-16M"
;;
*"VR500")
name="vr500"
;;
*"VR500")
name="vr500"
*"WT1520")
name="wt1520"
;;
*"WT1520")
name="wt1520"
;;
- *"WT3020")
- name="wt3020"
+ *"WT3020 (4M)")
+ name="wt3020-4M"
+ ;;
+ *"WT3020 (8M)")
+ name="wt3020-8M"
;;
*"WZR-AGL300NH")
name="wzr-agl300nh"
;;
*"WZR-AGL300NH")
name="wzr-agl300nh"
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
[ -f /tmp/sysinfo/board_name ] && name=$(cat /tmp/sysinfo/board_name)
[ -z "$name" ] && name="unknown"
+ echo "${name%-[0-9]*M}"
-case "$(cat /tmp/sysinfo/board_name)" in
+board=$(ramips_board_name)
+case $board in
witi)
partname=factory
offset=$((0xe000))
witi)
partname=factory
offset=$((0xe000))
/ {
compatible = "ASL26555", "ralink,rt3050-soc";
/ {
compatible = "ASL26555", "ralink,rt3050-soc";
- model = "Alpha ASL26555";
+ model = "Alpha ASL26555 (16M)";
gpio-keys-polled {
compatible = "gpio-keys-polled";
gpio-keys-polled {
compatible = "gpio-keys-polled";
/ {
compatible = "ASL26555", "ralink,rt3050-soc";
/ {
compatible = "ASL26555", "ralink,rt3050-soc";
- model = "Alpha ASL26555";
+ model = "Alpha ASL26555 (8M)";
gpio-keys-polled {
compatible = "gpio-keys-polled";
gpio-keys-polled {
compatible = "gpio-keys-polled";
+/ {
+ model = "NixcoreX1 (16M)";
+};
+
+/ {
+ model = "NixcoreX1 (8M)";
+};
+
/ {
compatible = "Nixcore", "ralink,rt5350-soc";
/ {
compatible = "Nixcore", "ralink,rt5350-soc";
chosen {
bootargs = "console=ttyS1,57600";
chosen {
bootargs = "console=ttyS1,57600";
+/ {
+ model = "VoCore (16M)";
+};
+
+/ {
+ model = "VoCore (8M)";
+};
+
/ {
compatible = "VoCore", "ralink,rt5350-soc";
/ {
compatible = "VoCore", "ralink,rt5350-soc";
gpio-export {
compatible = "gpio-export";
gpio-export {
compatible = "gpio-export";
/ {
compatible = "wt3020", "ralink,mt7620n-soc";
/ {
compatible = "wt3020", "ralink,mt7620n-soc";
+ model = "Nexx WT3020 (4M)";
gpio-keys-polled {
compatible = "gpio-keys-polled";
gpio-keys-polled {
compatible = "gpio-keys-polled";
/ {
compatible = "wt3020", "ralink,mt7620n-soc";
/ {
compatible = "wt3020", "ralink,mt7620n-soc";
+ model = "Nexx WT3020 (8M)";
gpio-keys-polled {
compatible = "gpio-keys-polled";
gpio-keys-polled {
compatible = "gpio-keys-polled";
BLOCKSIZE := 4k
IMAGE_SIZE := $(ralink_default_fw_size_4M)
IMAGES += factory.bin
BLOCKSIZE := 4k
IMAGE_SIZE := $(ralink_default_fw_size_4M)
IMAGES += factory.bin
- SUPPORTED_DEVICES := wt3020
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
poray-header -B WT3020 -F 4M
DEVICE_TITLE := Nexx WT3020 (4MB)
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
poray-header -B WT3020 -F 4M
DEVICE_TITLE := Nexx WT3020 (4MB)
define Device/wt3020-8M
DTS := WT3020-8M
IMAGES += factory.bin
define Device/wt3020-8M
DTS := WT3020-8M
IMAGES += factory.bin
- SUPPORTED_DEVICES := wt3020
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
poray-header -B WT3020 -F 8M
DEVICE_TITLE := Nexx WT3020 (8MB)
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
poray-header -B WT3020 -F 8M
DEVICE_TITLE := Nexx WT3020 (8MB)
define Device/asl26555-8M
DTS := ASL26555-8M
IMAGE_SIZE := 7744k
define Device/asl26555-8M
DTS := ASL26555-8M
IMAGE_SIZE := 7744k
- SUPPORTED_DEVICES := asl26555
DEVICE_TITLE := Alpha ASL26555
DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
endef
DEVICE_TITLE := Alpha ASL26555
DEVICE_PACKAGES := kmod-usb-core kmod-usb-dwc2 kmod-usb-ledtrig-usbport
endef
define Device/asl26555-16M
DTS := ASL26555-16M
IMAGE_SIZE := 15872k
define Device/asl26555-16M
DTS := ASL26555-16M
IMAGE_SIZE := 15872k
- SUPPORTED_DEVICES := asl26555
DEVICE_TITLE := Alpha ASL26555 16M
DEVICE_PACKAGES :=
endef
DEVICE_TITLE := Alpha ASL26555 16M
DEVICE_PACKAGES :=
endef
endef
TARGET_DEVICES += ncs601w
endef
TARGET_DEVICES += ncs601w
-define Device/nixcore-8M
+define Device/nixcore-x1-8M
DTS := NIXCORE-8M
IMAGE_SIZE := 7872k
DTS := NIXCORE-8M
IMAGE_SIZE := 7872k
- SUPPORTED_DEVICES := nixcore-x1
- DEVICE_TITLE := NixcoreX1 8M
+ DEVICE_TITLE := NixcoreX1 (8M)
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
endef
TARGET_DEVICES += nixcore-8M
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
endef
TARGET_DEVICES += nixcore-8M
-define Device/nixcore-16M
+define Device/nixcore-x1-16M
DTS := NIXCORE-16M
IMAGE_SIZE := 16064k
DTS := NIXCORE-16M
IMAGE_SIZE := 16064k
- SUPPORTED_DEVICES := nixcore-x1
- DEVICE_TITLE := NixcoreX1 16M
+ DEVICE_TITLE := NixcoreX1 (16M)
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
endef
TARGET_DEVICES += nixcore-16M
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-i2c-core kmod-i2c-ralink kmod-spi-dev
endef
TARGET_DEVICES += nixcore-16M
define Device/vocore-8M
DTS := VOCORE-8M
IMAGE_SIZE := 7872k
define Device/vocore-8M
DTS := VOCORE-8M
IMAGE_SIZE := 7872k
- SUPPORTED_DEVICES := vocore
- DEVICE_TITLE := VoCore 8M
+ DEVICE_TITLE := VoCore (8M)
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
kmod-spi-dev
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
kmod-spi-dev
define Device/vocore-16M
DTS := VOCORE-16M
IMAGE_SIZE := 16064k
define Device/vocore-16M
DTS := VOCORE-16M
IMAGE_SIZE := 16064k
- SUPPORTED_DEVICES := vocore
- DEVICE_TITLE := VoCore 16M
+ DEVICE_TITLE := VoCore (16M)
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
kmod-spi-dev
DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-ralink \
kmod-spi-dev