diff mbox series

[LEDE-DEV] Add support for raspberry pi 3 b+

Message ID 20180424232746.12467-1-christo.nedev@gmail.com
State Changes Requested
Headers show
Series [LEDE-DEV] Add support for raspberry pi 3 b+ | expand

Commit Message

Christo Nedev April 24, 2018, 11:27 p.m. UTC 
From: Christo Nedev <christo.nedev@me.com>

Signed-off-by: Christo Nedev <christo.nedev@me.com>
---
 target/linux/brcm2708/Makefile                               |  1 +
 target/linux/brcm2708/base-files/etc/board.d/02_network      |  3 ++-
 .../base-files/lib/preinit/05_set_preinit_iface_brcm2708     |  1 +
 target/linux/brcm2708/bcm2709/config-4.9                     |  1 +
 target/linux/brcm2708/bcm2710/config-4.9                     |  1 +
 target/linux/brcm2708/image/Makefile                         | 12 ++++++------
 6 files changed, 12 insertions(+), 7 deletions(-)

Comments

Stijn Tintel April 25, 2018, 7:21 a.m. UTC | #1 
On 25-04-18 02:27, Christo Nedev wrote:
> From: Christo Nedev <christo.nedev@me.com>
>
> Signed-off-by: Christo Nedev <christo.nedev@me.com>
> ---
>  target/linux/brcm2708/Makefile                               |  1 +
>  target/linux/brcm2708/base-files/etc/board.d/02_network      |  3 ++-
>  .../base-files/lib/preinit/05_set_preinit_iface_brcm2708     |  1 +
>  target/linux/brcm2708/bcm2709/config-4.9                     |  1 +
>  target/linux/brcm2708/bcm2710/config-4.9                     |  1 +
>  target/linux/brcm2708/image/Makefile                         | 12 ++++++------
>  6 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
> index 244513dfc6..528422eec2 100644
> --- a/target/linux/brcm2708/Makefile
> +++ b/target/linux/brcm2708/Makefile
> @@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/target.mk
>  DEFAULT_PACKAGES += \
>  	brcm2708-gpu-fw \
>  	kmod-usb-hid \
> +	kmod-usb-net kmod-usb-net-rndis kmod-usb-net-cdc-ether \
Nitpicking, and I know the other lines don't have everything in
alphabetical order either, but I'd have done it like that.
>  	kmod-sound-core kmod-sound-arm-bcm2835 \
>  	kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
>  	brcmfmac-firmware-43430-sdio kmod-brcmfmac wpad-mini
> diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
> index a9c947b65a..de3ded31f6 100755
> --- a/target/linux/brcm2708/base-files/etc/board.d/02_network
> +++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
> @@ -15,7 +15,8 @@ raspberrypi,model-b |\
>  raspberrypi,model-b-plus |\
>  raspberrypi,model-b-rev2 |\
>  raspberrypi,2-model-b |\
> -raspberrypi,3-model-b)
> +raspberrypi,3-model-b) |\
> +raspberrypi,3-model-b-plus
>  	ucidef_set_interface_lan "eth0"
>  	;;
>  
> diff --git a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
> index 76eb5905e8..3a5c198fc6 100644
> --- a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
> +++ b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
> @@ -8,6 +8,7 @@ set_preinit_iface() {
>  	case "$(board_name)" in
>  	raspberrypi,2-model-b |\
>  	raspberrypi,3-model-b |\
> +	raspberrypi,3-model-b-plus |\
>  	raspberrypi,model-b |\
>  	raspberrypi,model-b-plus |\
>  	raspberrypi,model-b-rev2)
> diff --git a/target/linux/brcm2708/bcm2709/config-4.9 b/target/linux/brcm2708/bcm2709/config-4.9
> index 71884a5fa1..38b97823bd 100644
> --- a/target/linux/brcm2708/bcm2709/config-4.9
> +++ b/target/linux/brcm2708/bcm2709/config-4.9
> @@ -400,6 +400,7 @@ CONFIG_USB_DWCOTG=y
>  # CONFIG_USB_EHCI_HCD is not set
>  CONFIG_USB_NET_DRIVERS=y
>  CONFIG_USB_NET_SMSC95XX=y
> +CONFIG_USB_LAN78XX=y
Not ordered alphabetically. The rest of the file is.
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_SUPPORT=y
>  CONFIG_USB_UAS=y
> diff --git a/target/linux/brcm2708/bcm2710/config-4.9 b/target/linux/brcm2708/bcm2710/config-4.9
> index d402f4b573..b7439ed47e 100644
> --- a/target/linux/brcm2708/bcm2710/config-4.9
> +++ b/target/linux/brcm2708/bcm2710/config-4.9
> @@ -418,6 +418,7 @@ CONFIG_USB_DWCOTG=y
>  # CONFIG_USB_EHCI_HCD is not set
>  CONFIG_USB_NET_DRIVERS=y
>  CONFIG_USB_NET_SMSC95XX=y
> +CONFIG_USB_LAN78XX=y
Same.
>  CONFIG_USB_STORAGE=y
>  CONFIG_USB_SUPPORT=y
>  CONFIG_USB_UAS=y
> diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
> index 9ea9a07a9d..691212de9f 100644
> --- a/target/linux/brcm2708/image/Makefile
> +++ b/target/linux/brcm2708/image/Makefile
> @@ -64,9 +64,9 @@ ifeq ($(SUBTARGET),bcm2708)
>  endif
>  
>  define Device/rpi-2
> -  DEVICE_TITLE := Raspberry Pi 2B/3B/3CM
> -  DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-cm3
> -  SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,compute-module-3
> +  DEVICE_TITLE := Raspberry Pi 2B/3B/3B+/3CM
> +  DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3
> +  SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,3-model-b-plus raspberrypi,compute-module-3
>  endef
>  ifeq ($(SUBTARGET),bcm2709)
>    TARGET_DEVICES += rpi-2
> @@ -74,9 +74,9 @@ endif
>  
>  define Device/rpi-3
>    KERNEL_IMG := kernel8.img
> -  DEVICE_TITLE := Raspberry Pi 3B (64 bit)
> -  DEVICE_DTS := broadcom/bcm2710-rpi-3-b
> -  SUPPORTED_DEVICES := rpi-3-b raspberrypi,3-model-b
> +  DEVICE_TITLE := Raspberry Pi 3B/3B+
> +  DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus
> +  SUPPORTED_DEVICES := rpi-3-b rpi-3-b-plus raspberrypi,3-model-b raspberrypi,3-model-b-plus
>  endef
>  ifeq ($(SUBTARGET),bcm2710)
>    TARGET_DEVICES += rpi-3

Please squash this with your previous patch, and use the correct prefix
in the commit message (brcm2708:)

Thanks,
Stijn
Jon Burgess April 25, 2018, 8:40 p.m. UTC | #2 
On Tue, 2018-04-24 at 23:27 +0000, Christo Nedev wrote:
> index a9c947b65a..de3ded31f6 100755
> --- a/target/linux/brcm2708/base-files/etc/board.d/02_network
> +++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
> @@ -15,7 +15,8 @@ raspberrypi,model-b |\
>  raspberrypi,model-b-plus |\
>  raspberrypi,model-b-rev2 |\
>  raspberrypi,2-model-b |\
> -raspberrypi,3-model-b)
> +raspberrypi,3-model-b) |\
> +raspberrypi,3-model-b-plus
>         ucidef_set_interface_lan "eth0"
>         ;;

Shouldn't the ")" be moved to the end of the line being added?

	Jon
diff mbox series

Patch

diff --git a/target/linux/brcm2708/Makefile b/target/linux/brcm2708/Makefile
index 244513dfc6..528422eec2 100644
--- a/target/linux/brcm2708/Makefile
+++ b/target/linux/brcm2708/Makefile
@@ -25,6 +25,7 @@  include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	brcm2708-gpu-fw \
 	kmod-usb-hid \
+	kmod-usb-net kmod-usb-net-rndis kmod-usb-net-cdc-ether \
 	kmod-sound-core kmod-sound-arm-bcm2835 \
 	kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
 	brcmfmac-firmware-43430-sdio kmod-brcmfmac wpad-mini
diff --git a/target/linux/brcm2708/base-files/etc/board.d/02_network b/target/linux/brcm2708/base-files/etc/board.d/02_network
index a9c947b65a..de3ded31f6 100755
--- a/target/linux/brcm2708/base-files/etc/board.d/02_network
+++ b/target/linux/brcm2708/base-files/etc/board.d/02_network
@@ -15,7 +15,8 @@  raspberrypi,model-b |\
 raspberrypi,model-b-plus |\
 raspberrypi,model-b-rev2 |\
 raspberrypi,2-model-b |\
-raspberrypi,3-model-b)
+raspberrypi,3-model-b) |\
+raspberrypi,3-model-b-plus
 	ucidef_set_interface_lan "eth0"
 	;;
 
diff --git a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708 b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
index 76eb5905e8..3a5c198fc6 100644
--- a/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
+++ b/target/linux/brcm2708/base-files/lib/preinit/05_set_preinit_iface_brcm2708
@@ -8,6 +8,7 @@  set_preinit_iface() {
 	case "$(board_name)" in
 	raspberrypi,2-model-b |\
 	raspberrypi,3-model-b |\
+	raspberrypi,3-model-b-plus |\
 	raspberrypi,model-b |\
 	raspberrypi,model-b-plus |\
 	raspberrypi,model-b-rev2)
diff --git a/target/linux/brcm2708/bcm2709/config-4.9 b/target/linux/brcm2708/bcm2709/config-4.9
index 71884a5fa1..38b97823bd 100644
--- a/target/linux/brcm2708/bcm2709/config-4.9
+++ b/target/linux/brcm2708/bcm2709/config-4.9
@@ -400,6 +400,7 @@  CONFIG_USB_DWCOTG=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_LAN78XX=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UAS=y
diff --git a/target/linux/brcm2708/bcm2710/config-4.9 b/target/linux/brcm2708/bcm2710/config-4.9
index d402f4b573..b7439ed47e 100644
--- a/target/linux/brcm2708/bcm2710/config-4.9
+++ b/target/linux/brcm2708/bcm2710/config-4.9
@@ -418,6 +418,7 @@  CONFIG_USB_DWCOTG=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_LAN78XX=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UAS=y
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 9ea9a07a9d..691212de9f 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -64,9 +64,9 @@  ifeq ($(SUBTARGET),bcm2708)
 endif
 
 define Device/rpi-2
-  DEVICE_TITLE := Raspberry Pi 2B/3B/3CM
-  DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-cm3
-  SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,compute-module-3
+  DEVICE_TITLE := Raspberry Pi 2B/3B/3B+/3CM
+  DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3
+  SUPPORTED_DEVICES := rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm raspberrypi,2-model-b raspberrypi,3-model-b raspberrypi,3-model-b-plus raspberrypi,compute-module-3
 endef
 ifeq ($(SUBTARGET),bcm2709)
   TARGET_DEVICES += rpi-2
@@ -74,9 +74,9 @@  endif
 
 define Device/rpi-3
   KERNEL_IMG := kernel8.img
-  DEVICE_TITLE := Raspberry Pi 3B (64 bit)
-  DEVICE_DTS := broadcom/bcm2710-rpi-3-b
-  SUPPORTED_DEVICES := rpi-3-b raspberrypi,3-model-b
+  DEVICE_TITLE := Raspberry Pi 3B/3B+
+  DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus
+  SUPPORTED_DEVICES := rpi-3-b rpi-3-b-plus raspberrypi,3-model-b raspberrypi,3-model-b-plus
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3