hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

brcm2708: add support for multi-device images 

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 47561
lede-17.01
John Crispin 2015-11-21 21:25:04 +00:00
parent a429d6998e
commit 31f9aec7d6
3 changed files with 16 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk
View File

@ -5,34 +5,10 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
define Profile/Default define Profile/RaspberryPi
NAME:=Raspberry Pi NAME:=Raspberry Pi Models B/B+/CM
endef endef
define Profile/Default/Description define Profile/RaspberryPi/Description
Raspberry Pi Raspberry Pi Models B/B+/CM
endef endef
$(eval $(call Profile,Default)) $(eval $(call Profile,RaspberryPi))
define Profile/RaspberryPi_B
NAME:=Raspberry Pi Model B
endef
define Profile/RaspberryPi_B/Description
Raspberry Pi Model B
endef
$(eval $(call Profile,RaspberryPi_B))
define Profile/RaspberryPi_BPlus
NAME:=Raspberry Pi Model B+
endef
define Profile/RaspberryPi_BPlus/Description
Raspberry Pi Model B+
endef
$(eval $(call Profile,RaspberryPi_BPlus))
define Profile/RaspberryPi_CM
NAME:=Raspberry Pi Compute Module
endef
define Profile/RaspberryPi_CM/Description
Raspberry Pi Model Compute Module
endef
$(eval $(call Profile,RaspberryPi_CM))

24
target/linux/brcm2708/image/Makefile
View File

@ -12,9 +12,9 @@ FAT32_BLOCK_SIZE=1024
FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
### Image scripts ### ### Image scripts ###
define Build/gen-cfg define Build/kernel-img
cat config.txt > $@.config perl $(LINUX_DIR)/scripts/mkknlimg $@ $@.tmp
echo -e "\ndevice_tree=$(DEVICE_DTS).dtb" >> $@.config mv $@.tmp $@
endef endef
define Build/boot-img define Build/boot-img
@ -28,9 +28,9 @@ define Build/boot-img
mcopy -i $@.boot $(KDIR)/fixup.dat :: mcopy -i $@.boot $(KDIR)/fixup.dat ::
mcopy -i $@.boot $(KDIR)/fixup_cd.dat :: mcopy -i $@.boot $(KDIR)/fixup_cd.dat ::
mcopy -i $@.boot cmdline.txt :: mcopy -i $@.boot cmdline.txt ::
mcopy -i $@.boot $@.config ::config.txt mcopy -i $@.boot config.txt ::
mcopy -i $@.boot $(word 1,$^) ::kernel.img mcopy -i $@.boot $(word 1,$^) ::kernel.img
mcopy -i $@.boot $(DTS_DIR)/$(DEVICE_DTS).dtb ::$(DEVICE_DTS).dtb $(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::)
mmd -i $@.boot ::/overlays mmd -i $@.boot ::/overlays
mcopy -i $@.boot $(DTS_DIR)/overlays/*.dtb ::/overlays/ mcopy -i $@.boot $(DTS_DIR)/overlays/*.dtb ::/overlays/
mcopy -i $@.boot $(DTS_DIR)/overlays/README ::/overlays/ mcopy -i $@.boot $(DTS_DIR)/overlays/README ::/overlays/
@ -46,9 +46,9 @@ endef
define Device/Default define Device/Default
FILESYSTEMS := ext4 FILESYSTEMS := ext4
PROFILES = Default $$(DEVICE_PROFILE) PROFILES = Default $$(DEVICE_PROFILE)
KERNEL := kernel-bin KERNEL := kernel-bin | kernel-img
IMAGES := sdcard.img IMAGES := sdcard.img
IMAGE/sdcard.img := gen-cfg | boot-img | sdcard-img IMAGE/sdcard.img := boot-img | sdcard-img
DEVICE_PROFILE := DEVICE_PROFILE :=
DEVICE_DTS := DEVICE_DTS :=
endef endef
@ -67,18 +67,14 @@ endef
### BCM2708/BCM2835 ### ### BCM2708/BCM2835 ###
ifeq ($(SUBTARGET),bcm2708) ifeq ($(SUBTARGET),bcm2708)
# Raspberry Pi Model B # Raspberry Pi Models B/B+/CM
$(eval $(call bcm270x,RaspberryPi_B,rpi-b,bcm2708-rpi-b)) $(eval $(call bcm270x,RaspberryPi,rpi,bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm))
# Raspberry Pi Model B+
$(eval $(call bcm270x,RaspberryPi_BPlus,rpi-b-plus,bcm2708-rpi-b-plus))
# Raspberry Pi Compute Module
$(eval $(call bcm270x,RaspberryPi_CM,rpi-cm,bcm2708-rpi-cm))
endif endif
### BCM2709/BCM2836 ### ### BCM2709/BCM2836 ###
ifeq ($(SUBTARGET),bcm2709) ifeq ($(SUBTARGET),bcm2709)
# Raspberry Pi 2 Model B # Raspberry Pi 2 Model B
$(eval $(call bcm270x,RaspberryPi_2,rpi-2-b,bcm2709-rpi-2-b)) $(eval $(call bcm270x,RaspberryPi_2,rpi-2,bcm2709-rpi-2-b))
endif endif
$(eval $(call BuildImage)) $(eval $(call BuildImage))

2
target/linux/brcm2708/image/config.txt
View File

@ -476,7 +476,7 @@
## Stop start.elf from filling in ATAGS (memory from 0x100) before ## Stop start.elf from filling in ATAGS (memory from 0x100) before
## launching kernel ## launching kernel
## ##
disable_commandline_tags=1 disable_commandline_tags=2
## cmdline (string) ## cmdline (string)
## Command line parameters. Can be used instead of cmdline.txt file ## Command line parameters. Can be used instead of cmdline.txt file