Author: blogic
Date: 2015-07-17 14:47:50 +0200 (Fri, 17 Jul 2015)
New Revision: 46396

Modified:
   trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk
   trunk/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk
   trunk/target/linux/brcm2708/image/Makefile
Log:
brcm2708: improve profiles and image generation

- Add profiles for bcm2708 subtarget.
- Check subtarget for image generation.

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-07-17 
11:37:47 UTC (rev 46395)
+++ trunk/target/linux/brcm2708/bcm2708/profiles/RaspberryPi.mk 2015-07-17 
12:47:50 UTC (rev 46396)
@@ -5,12 +5,26 @@
 # See /LICENSE for more information.
 #
 
-define Profile/RaspberryPi
+define Profile/Default
   NAME:=Raspberry Pi
 endef
+define Profile/Default/Description
+  Raspberry Pi
+endef
+$(eval $(call Profile,Default))
 
-define Profile/RaspberryPi/Description
-       Raspberry Pi board
+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))
 
-$(eval $(call Profile,RaspberryPi))
+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))

Modified: trunk/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk
===================================================================
--- trunk/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk        
2015-07-17 11:37:47 UTC (rev 46395)
+++ trunk/target/linux/brcm2708/bcm2709/profiles/RaspberryPi2.mk        
2015-07-17 12:47:50 UTC (rev 46396)
@@ -5,12 +5,10 @@
 # See /LICENSE for more information.
 #
 
-define Profile/RaspberryPi2
-  NAME:=Raspberry Pi 2
+define Profile/RaspberryPi_2
+  NAME:=Raspberry Pi 2 Model B
 endef
-
-define Profile/RaspberryPi2/Description
-       Raspberry Pi 2 board
+define Profile/RaspberryPi_2/Description
+  Raspberry Pi 2 Model B
 endef
-
-$(eval $(call Profile,RaspberryPi2))
+$(eval $(call Profile,RaspberryPi_2))

Modified: trunk/target/linux/brcm2708/image/Makefile
===================================================================
--- trunk/target/linux/brcm2708/image/Makefile  2015-07-17 11:37:47 UTC (rev 
46395)
+++ trunk/target/linux/brcm2708/image/Makefile  2015-07-17 12:47:50 UTC (rev 
46396)
@@ -67,11 +67,18 @@
   TARGET_DEVICES += $(2)
 endef
 
-# Raspberry Pi Model B
-$(eval $(call add_bcm2708,RaspberryPi,rpi-b,bcm2708-rpi-b))
-# Raspberry Pi Model B+
-$(eval $(call add_bcm2708,RaspberryPi,rpi-b-plus,bcm2708-rpi-b-plus))
-# Raspberry Pi 2 Model B
-$(eval $(call add_bcm2708,RaspberryPi2,rpi-2-b,bcm2709-rpi-2-b))
+### BCM2708/BCM2835 ###
+ifeq ($(SUBTARGET),bcm2708)
+  # Raspberry Pi Model B
+  $(eval $(call add_bcm2708,RaspberryPi_B,rpi-b,bcm2708-rpi-b))
+  # Raspberry Pi Model B+
+  $(eval $(call add_bcm2708,RaspberryPi_BPlus,rpi-b-plus,bcm2708-rpi-b-plus))
+endif
 
+### BCM2709/BCM2836 ###
+ifeq ($(SUBTARGET),bcm2709)
+  # Raspberry Pi 2 Model B
+  $(eval $(call add_bcm2708,RaspberryPi_2,rpi-2-b,bcm2709-rpi-2-b))
+endif
+
 $(eval $(call BuildImage))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to