Author: blogic Date: 2015-11-21 22:25:04 +0100 (Sat, 21 Nov 2015) New Revision: 47561
Modified: trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk trunk/target/linux/brcm2708/image/Makefile trunk/target/linux/brcm2708/image/config.txt Log: brcm2708: add support for multi-device images Signed-off-by: ?\195?\129lvaro Fern?\195?\161ndez Rojas <[email protected]> Modified: trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk =================================================================== --- trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk 2015-11-21 21:24:57 UTC (rev 47560) +++ trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk 2015-11-21 21:25:04 UTC (rev 47561) @@ -5,34 +5,10 @@ # See /LICENSE for more information. # -define Profile/Default - NAME:=Raspberry Pi +define Profile/RaspberryPi + NAME:=Raspberry Pi Models B/B+/CM endef -define Profile/Default/Description - Raspberry Pi +define Profile/RaspberryPi/Description + Raspberry Pi Models B/B+/CM endef -$(eval $(call Profile,Default)) - -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)) +$(eval $(call Profile,RaspberryPi)) Modified: trunk/target/linux/brcm2708/image/Makefile =================================================================== --- trunk/target/linux/brcm2708/image/Makefile 2015-11-21 21:24:57 UTC (rev 47560) +++ trunk/target/linux/brcm2708/image/Makefile 2015-11-21 21:25:04 UTC (rev 47561) @@ -12,9 +12,9 @@ FAT32_BLOCKS=$(shell echo $$(($(CONFIG_BRCM2708_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) ### Image scripts ### -define Build/gen-cfg - cat config.txt > [email protected] - echo -e "\ndevice_tree=$(DEVICE_DTS).dtb" >> [email protected] +define Build/kernel-img + perl $(LINUX_DIR)/scripts/mkknlimg $@ [email protected] + mv [email protected] $@ endef define Build/boot-img @@ -28,9 +28,9 @@ mcopy -i [email protected] $(KDIR)/fixup.dat :: mcopy -i [email protected] $(KDIR)/fixup_cd.dat :: mcopy -i [email protected] cmdline.txt :: - mcopy -i [email protected] [email protected] ::config.txt + mcopy -i [email protected] config.txt :: mcopy -i [email protected] $(word 1,$^) ::kernel.img - mcopy -i [email protected] $(DTS_DIR)/$(DEVICE_DTS).dtb ::$(DEVICE_DTS).dtb + $(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i [email protected] $(DTS_DIR)/$(dts).dtb ::) mmd -i [email protected] ::/overlays mcopy -i [email protected] $(DTS_DIR)/overlays/*.dtb ::/overlays/ mcopy -i [email protected] $(DTS_DIR)/overlays/README ::/overlays/ @@ -46,9 +46,9 @@ define Device/Default FILESYSTEMS := ext4 PROFILES = Default $$(DEVICE_PROFILE) - KERNEL := kernel-bin + KERNEL := kernel-bin | kernel-img IMAGES := sdcard.img - IMAGE/sdcard.img := gen-cfg | boot-img | sdcard-img + IMAGE/sdcard.img := boot-img | sdcard-img DEVICE_PROFILE := DEVICE_DTS := endef @@ -67,18 +67,14 @@ ### BCM2708/BCM2835 ### ifeq ($(SUBTARGET),bcm2708) - # Raspberry Pi Model B - $(eval $(call bcm270x,RaspberryPi_B,rpi-b,bcm2708-rpi-b)) - # 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)) + # Raspberry Pi Models B/B+/CM + $(eval $(call bcm270x,RaspberryPi,rpi,bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm)) endif ### BCM2709/BCM2836 ### ifeq ($(SUBTARGET),bcm2709) # 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 $(eval $(call BuildImage)) Modified: trunk/target/linux/brcm2708/image/config.txt =================================================================== --- trunk/target/linux/brcm2708/image/config.txt 2015-11-21 21:24:57 UTC (rev 47560) +++ trunk/target/linux/brcm2708/image/config.txt 2015-11-21 21:25:04 UTC (rev 47561) @@ -476,7 +476,7 @@ ## Stop start.elf from filling in ATAGS (memory from 0x100) before ## launching kernel ## -disable_commandline_tags=1 +disable_commandline_tags=2 ## cmdline (string) ## Command line parameters. Can be used instead of cmdline.txt file _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
