Skip to content

Commit

Permalink
brcm2708: rename target to bcm27xx (coolsnowwolf#3098)
Browse files Browse the repository at this point in the history
Signed-off-by: AmadeusGhost <[email protected]>
  • Loading branch information
aiamadeus authored Feb 17, 2020
1 parent fdd4f89 commit 6134149
Show file tree
Hide file tree
Showing 853 changed files with 124 additions and 46 deletions.
22 changes: 11 additions & 11 deletions config/Config-images.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ menu "Target Images"

choice
prompt "Compression"
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq40xx
default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
default TARGET_INITRAMFS_COMPRESSION_NONE
depends on TARGET_ROOTFS_INITRAMFS
help
Expand Down Expand Up @@ -194,7 +194,7 @@ menu "Target Images"
depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub2
default y

config EFI_IMAGES
bool "Build EFI GRUB images (Linux x86 or x86_64 host only)"
depends on TARGET_x86
Expand Down Expand Up @@ -262,22 +262,22 @@ menu "Target Images"
select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
default y

config VHD_IMAGES
bool "Build Hyper-V image files (VHD)"
depends on TARGET_x86 || TARGET_x86_64
default n
depends on GRUB_IMAGES || EFI_IMAGES
select TARGET_IMAGES_PAD
select PACKAGE_kmod-tulip

select PACKAGE_kmod-tulip
default n

config QCOW2_IMAGES
bool "Build PVE/KVM image files (QCOW2)"
depends on TARGET_x86 || TARGET_x86_64
default n
depends on GRUB_IMAGES || EFI_IMAGES
select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
select PACKAGE_kmod-e1000
default n

config TARGET_IMAGES_PAD
bool "Pad images to filesystem size (for JFFS2)"
Expand All @@ -297,7 +297,7 @@ menu "Target Images"
int "Kernel partition size (in MB)"
depends on GRUB_IMAGES || EFI_IMAGES || USES_BOOT_PART
default 8 if TARGET_apm821xx_sata
default 64 if TARGET_brcm2708
default 64 if TARGET_bcm27xx
default 16

config TARGET_ROOTFS_PARTSIZE
Expand Down
2 changes: 1 addition & 1 deletion config/Config-kernel.in
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ if KERNEL_CGROUPS

config KERNEL_BLK_DEV_THROTTLING
bool "Enable throttling policy"
default y if TARGET_brcm2708
default y if TARGET_bcm27xx

config KERNEL_BLK_DEV_THROTTLING_LOW
bool "Block throttling .low limit interface support (EXPERIMENTAL)"
Expand Down
2 changes: 1 addition & 1 deletion package/firmware/cypress-firmware/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PKG_SOURCE:=cypress-fmac-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://community.cypress.com/servlet/JiveServlet/download/19000-1-51721/
PKG_HASH:=a5510f82aacf585b5d29732b6d6777d4a4b26a667154d91cfcfc0d6d5dc4fef5

PKG_MAINTAINER:=?lvaro Fern?ndez Rojas <[email protected]>
PKG_MAINTAINER:=Álvaro Fernández Rojas <[email protected]>

include $(INCLUDE_DIR)/package.mk

Expand Down
8 changes: 4 additions & 4 deletions package/firmware/cypress-nvram/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ endef
define Package/cypress-nvram-43430-sdio-rpi-3b
$(Package/cypress-nvram-default)
TITLE:=CYW43430 NVRAM for Raspberry Pi 3B
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define Package/cypress-nvram-43430-sdio-rpi-3b/install
Expand All @@ -50,7 +50,7 @@ $(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-3b))
define Package/cypress-nvram-43430-sdio-rpi-zero-w
$(Package/cypress-nvram-default)
TITLE:=CYW43430 NVRAM for Raspberry Pi Zero W
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define Package/cypress-nvram-43430-sdio-rpi-zero-w/install
Expand All @@ -66,7 +66,7 @@ $(eval $(call BuildPackage,cypress-nvram-43430-sdio-rpi-zero-w))
define Package/cypress-nvram-43455-sdio-rpi-3b-plus
$(Package/cypress-nvram-default)
TITLE:=CYW43455 NVRAM for Raspberry Pi 3B+
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define Package/cypress-nvram-43455-sdio-rpi-3b-plus/install
Expand All @@ -82,7 +82,7 @@ $(eval $(call BuildPackage,cypress-nvram-43455-sdio-rpi-3b-plus))
define Package/cypress-nvram-43455-sdio-rpi-4b
$(Package/cypress-nvram-default)
TITLE:=CYW43455 NVRAM for Raspberry Pi 4B
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define Package/cypress-nvram-43455-sdio-rpi-4b/install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=brcm2708-gpu-fw
PKG_NAME:=bcm27xx-gpu-fw
PKG_VERSION:=2020-01-30
PKG_RELEASE:=63bdbe0ea609a69f5c0a2212d608ef3d9915a7ad

Expand Down Expand Up @@ -133,16 +133,16 @@ define Download/start4x_elf
endef
$(eval $(call Download,start4x_elf))

define Package/brcm2708-gpu-fw
define Package/bcm27xx-gpu-fw
SECTION:=boot
CATEGORY:=Boot Loaders
DEPENDS:=@TARGET_brcm2708
TITLE:=brcm2708-gpu-fw
DEFAULT:=y if TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
TITLE:=bcm27xx-gpu-fw
DEFAULT:=y if TARGET_bcm27xx
endef

define Package/brcm2708-gpu-fw/description
GPU and kernel boot firmware for brcm2708.
define Package/bcm27xx-gpu-fw/description
GPU and kernel boot firmware for bcm27xx.
endef

define Build/Prepare
Expand All @@ -168,7 +168,7 @@ define Build/Compile
true
endef

define Package/brcm2708-gpu-fw/install
define Package/bcm27xx-gpu-fw/install
true
endef

Expand All @@ -189,4 +189,4 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/fixup4x.dat $(KERNEL_BUILD_DIR)
endef

$(eval $(call BuildPackage,brcm2708-gpu-fw))
$(eval $(call BuildPackage,bcm27xx-gpu-fw))
4 changes: 2 additions & 2 deletions package/kernel/linux/modules/netdevices.mk
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ $(eval $(call KernelPackage,mii))
define KernelPackage/mdio-gpio
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:= Supports GPIO lib-based MDIO busses
DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_brcm2708_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio
DEPENDS:=+kmod-libphy @GPIO_SUPPORT +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio
KCONFIG:= \
CONFIG_MDIO_BITBANG \
CONFIG_MDIO_GPIO
Expand Down Expand Up @@ -273,7 +273,7 @@ $(eval $(call KernelPackage,switch-rtl8306))
define KernelPackage/switch-rtl8366-smi
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Realtek RTL8366 SMI switch interface support
DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_brcm2708_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio
DEPENDS:=@GPIO_SUPPORT +kmod-swconfig +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_samsung||TARGET_tegra):kmod-of-mdio
KCONFIG:=CONFIG_RTL8366_SMI
FILES:=$(LINUX_DIR)/drivers/net/phy/rtl8366_smi.ko
AUTOLOAD:=$(call AutoLoad,42,rtl8366_smi)
Expand Down
64 changes: 64 additions & 0 deletions package/utils/bcm27xx-userland/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#
# Copyright (C) 2019 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

include $(TOPDIR)/rules.mk

PKG_NAME:=bcm27xx-userland
PKG_VERSION:=42ec119e03eb8dffc7c83e2ac0e665e333abbef6
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)?
PKG_HASH:=cb0f1d653fdb9975783f30359277d9de2868607381e081796eac68745e3e8324

PKG_FLAGS:=nonshared

PKG_MAINTAINER:=Álvaro Fernández Rojas <[email protected]>

CMAKE_INSTALL:=1
CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr

ifeq ($(ARCH),aarch64)
CMAKE_OPTIONS+=-DARM64=ON
else
CMAKE_OPTIONS+=-DARM64=OFF
endif

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)

define Package/bcm27xx-userland
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:=@TARGET_bcm27xx
TITLE:=BCM27xx userland tools
DEFAULT:=y if TARGET_bcm27xx
endef

define Package/bcm27xx-userland/description
BCM27xx userland tools including vcgencmd and tvservice.
endef

define Package/bcm27xx-userland/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtparam $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtoverlay $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tvservice $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin

$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/

$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/
endef

$(eval $(call BuildPackage,bcm27xx-userland))
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt
@@ -24,7 +24,7 @@ if(NOT ARM64)

# ILCS pulls in EGL for the ILCS/EGL surface API support
target_link_libraries(vcilcs brcmEGL brcmGLESv2 khrn_client vchiq_arm vcos)
- set(INSTALL_TARGETS "${INSTALL_TARGETS} vcilcs")
+ set(INSTALL_TARGETS ${INSTALL_TARGETS} vcilcs)
endif()

# vchostif needs ilcore as well (vmcs_main pulls it in)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk

ARCH:=arm
BOARD:=brcm2708
BOARD:=bcm27xx
BOARDNAME:=Broadcom BCM27xx
FEATURES:=ext4 audio usb usbgadget display gpio fpu squashfs rootfs-part boot-part
MAINTAINER:=Álvaro Fernández Rojas <[email protected]>
Expand All @@ -23,7 +23,7 @@ endef

include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += \
brcm2708-gpu-fw \
bcm27xx-gpu-fw \
kmod-usb-hid \
kmod-sound-core kmod-sound-arm-bcm2835 \
kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ ROOTFSSIZE="$(($4 / 512))"

dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc



Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# See /LICENSE for more information.
#

include $(TOPDIR)/target/linux/brcm2708/modules/*.mk
include $(TOPDIR)/target/linux/bcm27xx/modules/*.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define KernelPackage/hwmon-raspberrypi
KCONFIG:=CONFIG_SENSORS_RASPBERRYPI_HWMON
FILES:=$(LINUX_DIR)/drivers/hwmon/raspberrypi-hwmon.ko
AUTOLOAD:=$(call AutoLoad,60,raspberrypi-hwmon)
$(call AddDepends/hwmon,@TARGET_brcm2708)
$(call AddDepends/hwmon,@TARGET_bcm27xx)
endef

define KernelPackage/hwmon-raspberrypi/description
Expand All @@ -23,7 +23,7 @@ $(eval $(call KernelPackage,hwmon-raspberrypi))
define KernelPackage/hwmon-rpi-poe-fan
SUBMENU:=$(HWMON_MENU)
TITLE:=Raspberry Pi PoE HAT fan
DEPENDS:=@TARGET_brcm2708 +kmod-hwmon-core
DEPENDS:=@TARGET_bcm27xx +kmod-hwmon-core
KCONFIG:=CONFIG_SENSORS_RPI_POE_FAN
FILES:=$(LINUX_DIR)/drivers/hwmon/rpi-poe-fan.ko
AUTOLOAD:=$(call AutoProbe,rpi-poe-fan)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ I2C_BCM2835_MODULES:=\
define KernelPackage/i2c-bcm2835
$(call i2c_defaults,$(I2C_BCM2835_MODULES),59)
TITLE:=Broadcom BCM2835 I2C master controller driver
DEPENDS:=@TARGET_brcm2708 +kmod-i2c-core
DEPENDS:=@TARGET_bcm27xx +kmod-i2c-core
endef

define KernelPackage/i2c-bcm2835/description
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ define KernelPackage/pwm-bcm2835
CONFIG_PWM_BCM2835
FILES:=$(LINUX_DIR)/drivers/pwm/pwm-bcm2835.ko
AUTOLOAD:=$(call AutoLoad,60,pwm-bcm2835)
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define KernelPackage/pwm-bcm2835/description
Expand All @@ -30,7 +30,7 @@ define KernelPackage/random-bcm2835
CONFIG_HW_RANDOM_BCM2835
FILES:=$(LINUX_DIR)/drivers/char/hw_random/bcm2835-rng.ko
AUTOLOAD:=$(call AutoLoad,11,bcm2835-rng)
DEPENDS:=@TARGET_brcm2708 +kmod-random-core
DEPENDS:=@TARGET_bcm27xx +kmod-random-core
endef

define KernelPackage/random-bcm2835/description
Expand All @@ -46,7 +46,7 @@ define KernelPackage/smi-bcm2835
KCONFIG:=CONFIG_BCM2835_SMI
FILES:=$(LINUX_DIR)/drivers/misc/bcm2835_smi.ko
AUTOLOAD:=$(call AutoLoad,20,bcm2835_smi)
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define KernelPackage/smi-bcm2835/description
Expand All @@ -63,7 +63,7 @@ define KernelPackage/smi-bcm2835-dev
KCONFIG:=CONFIG_BCM2835_SMI_DEV
FILES:=$(LINUX_DIR)/drivers/char/broadcom/bcm2835_smi_dev.ko
AUTOLOAD:=$(call AutoLoad,21,bcm2835_smi_dev)
DEPENDS:=@TARGET_brcm2708 +kmod-smi-bcm2835
DEPENDS:=@TARGET_bcm27xx +kmod-smi-bcm2835
endef

define KernelPackage/smi-bcm2835-dev/description
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define KernelPackage/sound-arm-bcm2835
FILES:= \
$(LINUX_DIR)/drivers/staging/vc04_services/bcm2835-audio/snd-bcm2835.ko
AUTOLOAD:=$(call AutoLoad,68,snd-bcm2835)
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
$(call AddDepends/sound)
endef

Expand All @@ -36,7 +36,7 @@ define KernelPackage/sound-soc-bcm2835-i2s
FILES:= \
$(LINUX_DIR)/sound/soc/bcm/snd-soc-bcm2835-i2s.ko
AUTOLOAD:=$(call AutoLoad,68,snd-soc-bcm2835-i2s)
DEPENDS:=@TARGET_brcm2708 +kmod-sound-soc-core
DEPENDS:=@TARGET_bcm27xx +kmod-sound-soc-core
$(call AddDepends/sound)
endef

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define KernelPackage/spi-bcm2835
CONFIG_SPI_MASTER=y
FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2835.ko
AUTOLOAD:=$(call AutoLoad,89,spi-bcm2835)
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define KernelPackage/spi-bcm2835/description
Expand All @@ -33,7 +33,7 @@ define KernelPackage/spi-bcm2835-aux
CONFIG_SPI_MASTER=y
FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm2835aux.ko
AUTOLOAD:=$(call AutoLoad,89,spi-bcm2835aux)
DEPENDS:=@TARGET_brcm2708
DEPENDS:=@TARGET_bcm27xx
endef

define KernelPackage/spi-bcm2835-aux/description
Expand Down
Loading

0 comments on commit 6134149

Please sign in to comment.