[v2,02/10] package/freescale-qoriq/fsl-qoriq-rcw: move rcw into freescale-qoriq and rename it
diff mbox series

Message ID 20191121102324.35225-3-jerry.huang@nxp.com
State Changes Requested
Headers show
Series
  • new board ls1028ardb introduced
Related show

Commit Message

Jerry Huang Nov. 21, 2019, 10:23 a.m. UTC
From: Jerry Huang <jerry.huang@nxp.com>

Move package/rcw into package/freescale-qoriq,
and rename it to fsl-qoriq-rcw.

Signed-off-by: Jerry Huang <jerry.huang@nxp.com>
---
changes since v1:
1. new patch
2. move rcw to sub-directory freescale-qoriq
3. rename to fsl-qoriq-rcw
---
 DEVELOPERS                                    |  2 +-
 package/Config.in.host                        |  2 +-
 .../fsl-qoriq-rcw}/Config.in.host             |  0
 .../fsl-qoriq-rcw/fsl-qoriq-rcw.hash}         |  0
 .../fsl-qoriq-rcw/fsl-qoriq-rcw.mk}           | 22 +++++++++----------
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename package/{rcw => freescale-qoriq/fsl-qoriq-rcw}/Config.in.host (100%)
 rename package/{rcw/rcw.hash => freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.hash} (100%)
 rename package/{rcw/rcw.mk => freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.mk} (72%)

Comments

Michael Walle Nov. 21, 2019, 10:34 a.m. UTC | #1
Am 2019-11-21 11:23, schrieb Changming Huang:
> From: Jerry Huang <jerry.huang@nxp.com>
> 
> Move package/rcw into package/freescale-qoriq,
> and rename it to fsl-qoriq-rcw.
> 
> Signed-off-by: Jerry Huang <jerry.huang@nxp.com>
> ---
> changes since v1:
> 1. new patch
> 2. move rcw to sub-directory freescale-qoriq
> 3. rename to fsl-qoriq-rcw

shouldn't be the naming consistent with the sub-directory? I know there 
is already a freescale-imx and the packages are only named imx-*. On the 
other hand, the variable names will be longer. Mhh.

[snip]

-michael
Jerry Huang Nov. 21, 2019, 10:42 a.m. UTC | #2
Hi, Michael,

Best Regards
Jerry Huang

> -----Original Message-----
> From: Michael Walle <michael@walle.cc>
> Sent: Thursday, November 21, 2019 6:35 PM
> To: Jerry Huang <jerry.huang@nxp.com>
> Cc: buildroot@busybox.net; geomatsi@gmail.com;
> matthew.weber@collins.com; thomas.petazzoni@bootlin.com
> Subject: [EXT] Re: [PATCH v2 02/10] package/freescale-qoriq/fsl-qoriq-rcw: move
> rcw into freescale-qoriq and rename it
> 
> Caution: EXT Email
> 
> Am 2019-11-21 11:23, schrieb Changming Huang:
> > From: Jerry Huang <jerry.huang@nxp.com>
> >
> > Move package/rcw into package/freescale-qoriq, and rename it to
> > fsl-qoriq-rcw.
> >
> > Signed-off-by: Jerry Huang <jerry.huang@nxp.com>
> > ---
> > changes since v1:
> > 1. new patch
> > 2. move rcw to sub-directory freescale-qoriq 3. rename to
> > fsl-qoriq-rcw
> 
> shouldn't be the naming consistent with the sub-directory? I know there is
> already a freescale-imx and the packages are only named imx-*. On the other
> hand, the variable names will be longer. Mhh.
If keep the same with sub-directory, it is too long, so I use the short name "fsl" to replace "freescale".
Actually, the FSL is used widely before freescale is merge into NXP.

> [snip]
> 
> -michael
Thomas Petazzoni Nov. 25, 2019, 9:15 p.m. UTC | #3
On Thu, 21 Nov 2019 18:23:16 +0800
Changming Huang <jerry.huang@nxp.com> wrote:

> From: Jerry Huang <jerry.huang@nxp.com>
> 
> Move package/rcw into package/freescale-qoriq,
> and rename it to fsl-qoriq-rcw.
> 
> Signed-off-by: Jerry Huang <jerry.huang@nxp.com>

Then, this package should be named nxp-qoriq-rcw, if you decide to name
the directory nxp-qoriq/.

> ---
> changes since v1:
> 1. new patch
> 2. move rcw to sub-directory freescale-qoriq
> 3. rename to fsl-qoriq-rcw
> ---
>  DEVELOPERS                                    |  2 +-
>  package/Config.in.host                        |  2 +-

You need Config.in.legacy handling due to the renaming of the option.

> diff --git a/DEVELOPERS b/DEVELOPERS
> index 19ea83df3b..9fbe229eb7 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1603,7 +1603,7 @@ F:	package/python-pyrex/
>  F:	package/python-tinyrpc/
>  F:	package/python-txdbus/
>  F:	package/raptor/
> -F:	package/rcw/
> +F:	package/freescale-qoriq/fsl-qoriq-rcw/

Please preserve alphabetic ordering.

>  F:	package/rng-tools/
>  F:	package/rsyslog/
>  F:	package/setools/
> diff --git a/package/Config.in.host b/package/Config.in.host
> index 758c268e00..e4840080ad 100644
> --- a/package/Config.in.host
> +++ b/package/Config.in.host
> @@ -62,7 +62,7 @@ menu "Host utilities"
>  	source "package/qemu/Config.in.host"
>  	source "package/raspberrypi-usbboot/Config.in.host"
>  	source "package/rauc/Config.in.host"
> -	source "package/rcw/Config.in.host"
> +	source "package/freescale-qoriq/fsl-qoriq-rcw/Config.in.host"

Ditto: alphabetic ordering.

> -RCW_VERSION = LSDK-18.12
> -RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
> -RCW_SITE_METHOD = git
> -RCW_LICENSE = BSD-3-Clause
> -RCW_LICENSE_FILES = LICENSE
> +FSL_QORIQ_RCW_VERSION = LSDK-18.12
> +FSL_QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
> +FSL_QORIQ_RCW_SITE_METHOD = git
> +FSL_QORIQ_RCW_LICENSE = BSD-3-Clause
> +FSL_QORIQ_RCW_LICENSE_FILES = LICENSE
>  
>  RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))

How come the BR2_PACKAGE_HOST_RCW_CUSTOM_PATH option is not renamed ?

Also RCW_FILES should become NXP_QORIQ_RCW_FILES. All variables in the
.mk file should be renamed.

> -define HOST_RCW_ADD_CUSTOM_RCW_FILES
> +define HOST_FSL_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
>  	mkdir -p $(@D)/custom_board/rcw
>  	cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
>  	cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
>  endef
>  HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES

If you don't change the hook registration, the hook will never be
called. Please check globally in this patch.

Thanks,

Thomas
Jerry Huang Nov. 26, 2019, 3:25 a.m. UTC | #4
Thanks a lot for your comment, Thomas.

Best Regards
Jerry Huang

> -----Original Message-----
> From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Sent: Tuesday, November 26, 2019 5:16 AM
> To: Jerry Huang <jerry.huang@nxp.com>
> Cc: buildroot@busybox.net; michael@walle.cc; matthew.weber@collins.com;
> geomatsi@gmail.com
> Subject: [EXT] Re: [Buildroot] [PATCH v2 02/10]
> package/freescale-qoriq/fsl-qoriq-rcw: move rcw into freescale-qoriq and
> rename it
> 
> Caution: EXT Email
> 
> On Thu, 21 Nov 2019 18:23:16 +0800
> Changming Huang <jerry.huang@nxp.com> wrote:
> 
> > From: Jerry Huang <jerry.huang@nxp.com>
> >
> > Move package/rcw into package/freescale-qoriq, and rename it to
> > fsl-qoriq-rcw.
> >
> > Signed-off-by: Jerry Huang <jerry.huang@nxp.com>
> 
> Then, this package should be named nxp-qoriq-rcw, if you decide to name the
> directory nxp-qoriq/.
I renamed this package to qoriq-rcw, is it ok?
Because there are similar naming in freescale-imx.

> > ---
> > changes since v1:
> > 1. new patch
> > 2. move rcw to sub-directory freescale-qoriq 3. rename to
> > fsl-qoriq-rcw
> > ---
> >  DEVELOPERS                                    |  2 +-
> >  package/Config.in.host                        |  2 +-
> 
> You need Config.in.legacy handling due to the renaming of the option.
Sure, I will do it.

> 
> > diff --git a/DEVELOPERS b/DEVELOPERS
> > index 19ea83df3b..9fbe229eb7 100644
> > --- a/DEVELOPERS
> > +++ b/DEVELOPERS
> > @@ -1603,7 +1603,7 @@ F:      package/python-pyrex/
> >  F:   package/python-tinyrpc/
> >  F:   package/python-txdbus/
> >  F:   package/raptor/
> > -F:   package/rcw/
> > +F:   package/freescale-qoriq/fsl-qoriq-rcw/
> 
> Please preserve alphabetic ordering.
Sure

> 
> >  F:   package/rng-tools/
> >  F:   package/rsyslog/
> >  F:   package/setools/
> > diff --git a/package/Config.in.host b/package/Config.in.host index
> > 758c268e00..e4840080ad 100644
> > --- a/package/Config.in.host
> > +++ b/package/Config.in.host
> > @@ -62,7 +62,7 @@ menu "Host utilities"
> >       source "package/qemu/Config.in.host"
> >       source "package/raspberrypi-usbboot/Config.in.host"
> >       source "package/rauc/Config.in.host"
> > -     source "package/rcw/Config.in.host"
> > +     source "package/freescale-qoriq/fsl-qoriq-rcw/Config.in.host"
> 
> Ditto: alphabetic ordering.
sure

> 
> > -RCW_VERSION = LSDK-18.12
> > -RCW_SITE =
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsour
> >
> ce.codeaurora.org%2Fexternal%2Fqoriq%2Fqoriq-components%2Frcw&amp;da
> ta
> >
> =02%7C01%7Cjerry.huang%40nxp.com%7C440c1c4d06f845dca04908d771ec9b
> da%7C
> >
> 686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637103133347439348&a
> mp;sdat
> >
> a=stm4A4DGFRjWmRHcqo%2FLchoIgp4GjrpRk6JvryEf6zc%3D&amp;reserved=0
> > -RCW_SITE_METHOD = git
> > -RCW_LICENSE = BSD-3-Clause
> > -RCW_LICENSE_FILES = LICENSE
> > +FSL_QORIQ_RCW_VERSION = LSDK-18.12
> > +FSL_QORIQ_RCW_SITE =
> > +https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsou
> >
> +rce.codeaurora.org%2Fexternal%2Fqoriq%2Fqoriq-components%2Frcw&amp;
> da
> >
> +ta=02%7C01%7Cjerry.huang%40nxp.com%7C440c1c4d06f845dca04908d771e
> c9bda
> >
> +%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C6371031333474393
> 48&amp;
> >
> +sdata=stm4A4DGFRjWmRHcqo%2FLchoIgp4GjrpRk6JvryEf6zc%3D&amp;reser
> ved=0
> > +FSL_QORIQ_RCW_SITE_METHOD = git
> > +FSL_QORIQ_RCW_LICENSE = BSD-3-Clause
> > +FSL_QORIQ_RCW_LICENSE_FILES = LICENSE
> >
> >  RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))
> 
> How come the BR2_PACKAGE_HOST_RCW_CUSTOM_PATH option is not
> renamed ?
> 
> Also RCW_FILES should become NXP_QORIQ_RCW_FILES. All variables in the .mk
> file should be renamed.
I will rename all optioins.

> > -define HOST_RCW_ADD_CUSTOM_RCW_FILES
> > +define HOST_FSL_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
> >       mkdir -p $(@D)/custom_board/rcw
> >       cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
> >       cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw  endef
> > HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
> 
> If you don't change the hook registration, the hook will never be called. Please
> check globally in this patch.
Ok, will do it.

> Thanks,
> 
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.c
> om&amp;data=02%7C01%7Cjerry.huang%40nxp.com%7C440c1c4d06f845dca0
> 4908d771ec9bda%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637
> 103133347439348&amp;sdata=Efi59wYwQ4QCZ7KLiyj6acpsadH5BuGJk%2FFyY
> dMDnBc%3D&amp;reserved=0

Patch
diff mbox series

diff --git a/DEVELOPERS b/DEVELOPERS
index 19ea83df3b..9fbe229eb7 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1603,7 +1603,7 @@  F:	package/python-pyrex/
 F:	package/python-tinyrpc/
 F:	package/python-txdbus/
 F:	package/raptor/
-F:	package/rcw/
+F:	package/freescale-qoriq/fsl-qoriq-rcw/
 F:	package/rng-tools/
 F:	package/rsyslog/
 F:	package/setools/
diff --git a/package/Config.in.host b/package/Config.in.host
index 758c268e00..e4840080ad 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -62,7 +62,7 @@  menu "Host utilities"
 	source "package/qemu/Config.in.host"
 	source "package/raspberrypi-usbboot/Config.in.host"
 	source "package/rauc/Config.in.host"
-	source "package/rcw/Config.in.host"
+	source "package/freescale-qoriq/fsl-qoriq-rcw/Config.in.host"
 	source "package/rustc/Config.in.host"
 	source "package/s6-rc/Config.in.host"
 	source "package/sam-ba/Config.in.host"
diff --git a/package/rcw/Config.in.host b/package/freescale-qoriq/fsl-qoriq-rcw/Config.in.host
similarity index 100%
rename from package/rcw/Config.in.host
rename to package/freescale-qoriq/fsl-qoriq-rcw/Config.in.host
diff --git a/package/rcw/rcw.hash b/package/freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.hash
similarity index 100%
rename from package/rcw/rcw.hash
rename to package/freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.hash
diff --git a/package/rcw/rcw.mk b/package/freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.mk
similarity index 72%
rename from package/rcw/rcw.mk
rename to package/freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.mk
index 36d2da61b5..a5f3854271 100644
--- a/package/rcw/rcw.mk
+++ b/package/freescale-qoriq/fsl-qoriq-rcw/fsl-qoriq-rcw.mk
@@ -1,14 +1,14 @@ 
 ################################################################################
 #
-# rcw
+# fsl-qoriq-rcw
 #
 ################################################################################
 
-RCW_VERSION = LSDK-18.12
-RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
-RCW_SITE_METHOD = git
-RCW_LICENSE = BSD-3-Clause
-RCW_LICENSE_FILES = LICENSE
+FSL_QORIQ_RCW_VERSION = LSDK-18.12
+FSL_QORIQ_RCW_SITE = https://source.codeaurora.org/external/qoriq/qoriq-components/rcw
+FSL_QORIQ_RCW_SITE_METHOD = git
+FSL_QORIQ_RCW_LICENSE = BSD-3-Clause
+FSL_QORIQ_RCW_LICENSE_FILES = LICENSE
 
 RCW_FILES = $(call qstrip,$(BR2_PACKAGE_HOST_RCW_CUSTOM_PATH))
 
@@ -23,28 +23,28 @@  $(error BR2_PACKAGE_HOST_RCW_CUSTOM_PATH must have exactly one .rcw file)
 endif
 endif
 
-define HOST_RCW_ADD_CUSTOM_RCW_FILES
+define HOST_FSL_QORIQ_RCW_ADD_CUSTOM_RCW_FILES
 	mkdir -p $(@D)/custom_board/rcw
 	cp -f $(filter-out %.rcw,$(RCW_FILES)) $(@D)/custom_board
 	cp -f $(filter %.rcw,$(RCW_FILES)) $(@D)/custom_board/rcw
 endef
 HOST_RCW_POST_PATCH_HOOKS += HOST_RCW_ADD_CUSTOM_RCW_FILES
 
-define HOST_RCW_BUILD_CMDS
+define HOST_FSL_QORIQ_RCW_BUILD_CMDS
 	python $(@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
+define HOST_FSL_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_RCW_INSTALL_CMDS
+define HOST_FSL_QORIQ_RCW_INSTALL_CMDS
 	mkdir -p  $(HOST_DIR)/share/rcw
 	cp -a $(@D)/* $(HOST_DIR)/share/rcw
-	$(HOST_RCW_INSTALL_DELIVERY_FILE)
+	$(HOST_FSL_QORIQ_RCW_INSTALL_DELIVERY_FILE)
 endef
 
 $(eval $(host-generic-package))