NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qoriq-rcw: rename from package/rcw

Browse Source 
This is really only for QoriQ SoCs. Also the upstream package - despite
its base name of the git repository - is "qoriq-components/rcw". Thus
rename it to a more specify package name.

Note that there are other rcw implementations for other platforms, and
each implementation only applies to that specific platform; it hus does
not make sense that there are more than one rcw enabled at the same
time; so we keep using /usr/share/rcw as the install location; this also
help backward compatibility with existing post-build scripts.

Signed-off-by: Changming Huang <jerry.huang@nxp.com>
Cc: Michael Walle <michael@walle.cc>
[yann.morin.1998@free.fr:
  - rebase on master
  - incorporate changes by Michael
  - don't move to an 'nxp' sub-directory
  - reword the legacy entry; select the new package
  - expand commit log to explain why we keep installing in
    host/usr/share/rcw/ (thanks to Michael for prompting that)
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Changming Huang 2020-02-07 16:38:50 +08:00 committed by Yann E. MORIN
parent 5b0ffd5c3d
commit ad50d8a478
7 changed files with 83 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Config.in.legacy
View File

@ -146,6 +146,15 @@ endif
comment "Legacy options removed in 2021.02"
config BR2_PACKAGE_HOST_RCW
bool "rcw package was renamed to oriq-rcw"
select BR2_PACKAGE_HOST_QORIQ_RCW
select BR2_LEGACY
help
The rcw package was specific to the QorIQ platform, so it has
been renamed to qoriq-rcw, to leave room for other *-rcw
packages for other platforms.
config BR2_KERNEL_HEADERS_5_8
bool "kernel headers version 5.8.x are no longer supported"
select BR2_LEGACY

2
DEVELOPERS
View File

@ -1747,8 +1747,8 @@ F: package/python-pyrex/
F: package/python-pysftp/
F: package/python-tinyrpc/
F: package/python-txdbus/
F: package/qoriq-rcw/
F: package/raptor/
F: package/rcw/
F: package/rng-tools/
F: package/rsyslog/
F: package/setools/

2
package/Config.in.host
View File

@ -70,9 +70,9 @@ menu "Host utilities"
source "package/python-xlrd/Config.in.host"
source "package/python3/Config.in.host"
source "package/qemu/Config.in.host"
source "package/qoriq-rcw/Config.in.host"
source "package/raspberrypi-usbboot/Config.in.host"
source "package/rauc/Config.in.host"
source "package/rcw/Config.in.host"
source "package/rustc/Config.in.host"
source "package/s6-rc/Config.in.host"
source "package/sam-ba/Config.in.host"

8
package/rcw/Config.in.host → package/qoriq-rcw/Config.in.host
View File

@ -1,5 +1,5 @@
config BR2_PACKAGE_HOST_RCW
bool "host rcw"
config BR2_PACKAGE_HOST_QORIQ_RCW
bool "host qoriq-rcw"
help
This package provides an reset configuration word(RCW)
compiler to build NXP QoriQ/LS PBL/RCW binary(s).
@ -11,9 +11,9 @@ config BR2_PACKAGE_HOST_RCW
https://source.codeaurora.org/external/qoriq/qoriq-components/rcw/
if BR2_PACKAGE_HOST_RCW
if BR2_PACKAGE_HOST_QORIQ_RCW
config BR2_PACKAGE_HOST_RCW_CUSTOM_PATH
config BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH
string "RCW Source file paths"
help
Space-separated list of .rcw and .rcwi files, that will be

2
package/rcw/rcw.hash → package/qoriq-rcw/qoriq-rcw.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 b69a6a8b187ba794e0af716a509ced2bbac83da0f6e94b5c7331a34619db21b1 rcw-LSDK-19.09.tar.gz
sha256 4a9ce5bb1733239bf1b740b705df20f90802b16114e24f3fd56c08a7ba4b56c2 qoriq-rcw-LSDK-19.09.tar.gz
sha256 a531b3146425e592db17a51ff39c4801cb01fb4055ffdaada0572decc0655bcd LICENSE

67
package/qoriq-rcw/qoriq-rcw.mk Normal file
View File

@ -0,0 +1,67 @@
################################################################################
#
# qoriq-rcw
#
################################################################################
QORIQ_RCW_VERSION = LSDK-19.09
QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
QORIQ_RCW_SITE_METHOD = git
QORIQ_RCW_LICENSE = BSD-3-Clause
QORIQ_RCW_LICENSE_FILES = LICENSE
HOST_QORIQ_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
QORIQ_RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH))
ifneq ($(QORIQ_RCW_FILES),)
QORIQ_RCW_INCLUDES = $(filter-out %.rcw,$(QORIQ_RCW_FILES))
# Get the name of the custom rcw file from the custom list
QORIQ_RCW_PROJECT = $(notdir $(filter %.rcw,$(QORIQ_RCW_FILES)))
# Error if there are no or more than one .rcw file
ifeq ($(BR_BUILDING),y)
ifneq ($(words $(QORIQ_RCW_PROJECT)),1)
$(error BR2_PACKAGE_HOST_QORIQ_RCW_CUSTOM_PATH must have exactly one .rcw file)
endif
endif
ifneq ($(QORIQ_RCW_INCLUDES),)
define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES
mkdir -p $(@D)/custom_board
cp -f $(QORIQ_RCW_INCLUDES) $(@D)/custom_board
endef
HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_INCLUDES
endif
define HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
mkdir -p $(@D)/custom_board/rcw
cp -f $(filter %.rcw,$(QORIQ_RCW_FILES)) $(@D)/custom_board/rcw
endef
HOST_QORIQ_RCW_POST_PATCH_HOOKS += HOST_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
# rcw.py is a python3-only script, and we can be using either the
# system-provided python3, or our own built with host-python3.
# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will
# easily find it from PATH.
define HOST_QORIQ_RCW_BUILD_CMDS
PATH=$(BR_PATH) \
$(@D)/rcw.py \
-i $(@D)/custom_board/rcw/$(QORIQ_RCW_PROJECT) \
-I $(@D)/custom_board -o $(@D)/PBL.bin
endef
define HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE
$(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin
endef
endif
# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer
# could use a post image or SDK to build/install PBL files.
define HOST_QORIQ_RCW_INSTALL_CMDS
mkdir -p $(HOST_DIR)/share/rcw
cp -a $(@D)/* $(HOST_DIR)/share/rcw
$(HOST_QORIQ_RCW_INSTALL_DELIVERY_FILE)
endef
$(eval $(host-generic-package))

67
package/rcw/rcw.mk
View File

@ -1,67 +0,0 @@
################################################################################
#
# rcw
#
################################################################################
RCW_VERSION = LSDK-19.09
RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
RCW_SITE_METHOD = git
RCW_LICENSE = BSD-3-Clause
RCW_LICENSE_FILES = LICENSE
HOST_RCW_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))
ifneq ($(RCW_FILES),)
RCW_INCLUDES = $(filter-out %.rcw,$(RCW_FILES))
# Get the name of the custom rcw file from the custom list
RCW_PROJECT = $(notdir $(filter %.rcw,$(RCW_FILES)))
# Error if there are no or more than one .rcw file
ifeq ($(BR_BUILDING),y)
ifneq ($(words $(RCW_PROJECT)),1)
$(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file)
endif
endif
ifneq ($(RCW_INCLUDES),)
define HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
mkdir -p $(@D)/custom_board
cp -f $(RCW_INCLUDES) $(@D)/custom_board
endef
HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_INCLUDES
endif
define HOST_RCW_ADD_CUSTOM_RCW_FILES
mkdir -p $(@D)/custom_board/rcw
cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
endef
HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
# rcw.py is a python3-only script, and we can be using either the
# system-provided python3, or our own built with host-python3.
# Fortunately, rcw.py uses #!/usr/bin/env python3, so it will
# easily find it from PATH.
define HOST_RCW_BUILD_CMDS
PATH=$(BR_PATH) \
$(@D)/rcw.py \
-i $(@D)/custom_board/rcw/$(RCW_PROJECT) \
-I $(@D)/custom_board -o $(@D)/PBL.bin
endef
define HOST_RCW_INSTALL_DELIVERY_FILE
$(INSTALL) -D -m 0644 $(@D)/PBL.bin $(BINARIES_DIR)/PBL.bin
endef
endif
# Copy source files and script into $(HOST_DIR)/share/rcw/ so a developer
# could use a post image or SDK to build/install PBL files.
define HOST_RCW_INSTALL_CMDS
mkdir -p $(HOST_DIR)/share/rcw
cp -a $(@D)/* $(HOST_DIR)/share/rcw
$(HOST_RCW_INSTALL_DELIVERY_FILE)
endef
$(eval $(host-generic-package))