mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
octeon: apply vendor_model scheme to device definition/image name
This updates the device definition name for octeon target to provide more useful names for the images and be consistent with the increasing number of targets following that scheme. Since the target is not using device tree yet, this does not touch board_name and thus sets BOARD_NAME in image Makefile to ensure sysupgrade is still working. While at it, move Build block before Device blocks and remove trailing whitespace for CMDLINE. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
49d66e0468
commit
1e3bfbafd3
@ -7,6 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
include $(INCLUDE_DIR)/image.mk
|
include $(INCLUDE_DIR)/image.mk
|
||||||
|
|
||||||
|
define Build/strip-kernel
|
||||||
|
# Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section
|
||||||
|
$(TARGET_CROSS)strip -R .notes $@ -o $@.stripped && mv $@.stripped $@
|
||||||
|
endef
|
||||||
|
|
||||||
define Device/Default
|
define Device/Default
|
||||||
PROFILES = Default $$(DEVICE_NAME)
|
PROFILES = Default $$(DEVICE_NAME)
|
||||||
KERNEL_NAME := vmlinux.elf
|
KERNEL_NAME := vmlinux.elf
|
||||||
@ -17,11 +22,6 @@ define Device/Default
|
|||||||
IMAGE/sysupgrade.tar := sysupgrade-tar
|
IMAGE/sysupgrade.tar := sysupgrade-tar
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/strip-kernel
|
|
||||||
# Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section
|
|
||||||
$(TARGET_CROSS)strip -R .notes $@ -o $@.stripped && mv $@.stripped $@
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Device/generic
|
define Device/generic
|
||||||
DEVICE_VENDOR := Generic
|
DEVICE_VENDOR := Generic
|
||||||
DEVICE_MODEL := Octeon
|
DEVICE_MODEL := Octeon
|
||||||
@ -30,19 +30,21 @@ endef
|
|||||||
TARGET_DEVICES += generic
|
TARGET_DEVICES += generic
|
||||||
|
|
||||||
ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait
|
ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait
|
||||||
define Device/er
|
define Device/ubnt_edgerouter
|
||||||
DEVICE_VENDOR := Ubiquiti
|
DEVICE_VENDOR := Ubiquiti
|
||||||
DEVICE_MODEL := EdgeRouter
|
DEVICE_MODEL := EdgeRouter
|
||||||
|
BOARD_NAME := er
|
||||||
CMDLINE := $(ER_CMDLINE)
|
CMDLINE := $(ER_CMDLINE)
|
||||||
endef
|
endef
|
||||||
TARGET_DEVICES += er
|
TARGET_DEVICES += ubnt_edgerouter
|
||||||
|
|
||||||
ERLITE_CMDLINE:=-mtdparts=phys_mapped_flash:512k(boot0)ro,512k(boot1)ro,64k(eeprom)ro root=/dev/sda2 rootfstype=squashfs,ext4 rootwait
|
ERLITE_CMDLINE:=-mtdparts=phys_mapped_flash:512k(boot0)ro,512k(boot1)ro,64k(eeprom)ro root=/dev/sda2 rootfstype=squashfs,ext4 rootwait
|
||||||
define Device/erlite
|
define Device/ubnt_edgerouter-lite
|
||||||
DEVICE_VENDOR := Ubiquiti
|
DEVICE_VENDOR := Ubiquiti
|
||||||
DEVICE_MODEL := EdgeRouter Lite
|
DEVICE_MODEL := EdgeRouter Lite
|
||||||
|
BOARD_NAME := erlite
|
||||||
CMDLINE := $(ERLITE_CMDLINE)
|
CMDLINE := $(ERLITE_CMDLINE)
|
||||||
endef
|
endef
|
||||||
TARGET_DEVICES += erlite
|
TARGET_DEVICES += ubnt_edgerouter-lite
|
||||||
|
|
||||||
$(eval $(call BuildImage))
|
$(eval $(call BuildImage))
|
||||||
|
Loading…
Reference in New Issue
Block a user