Skip to contentSkip to conversation

powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

PATCH New Prabhakar Kushwaha 3 participants 5 messages Jan 13, 2014 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Rename CONFIG_PBLRCW_CONFIG and CONFIG_PBLRCW_CONFIG.

Also add their details in README.

---
 Makefile                            |    4 ++--
 README                              |    7 +++++++
 include/configs/B4860QDS.h          |    4 ++--
 include/configs/P2041RDB.h          |    5 +++--
 include/configs/T1040QDS.h          |    4 ++--
 include/configs/T2080QDS.h          |    4 ++--
 include/configs/T4240QDS.h          |    4 ++--
 include/configs/corenet_ds.h        |   14 +++++++++-----
 include/configs/km/kmp204x-common.h |    4 ++--
 9 files changed, 31 insertions(+), 19 deletions(-)
Makefile +2 -2
index e6f6edb..beee7ec 100644
@@ -419,8 +419,8 @@ $(obj)u-boot.kwb:       $(obj)u-boot.bin
 		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $@
 
 $(obj)u-boot.pbl:	$(obj)u-boot.bin
-		$(obj)tools/mkimage -n $(CONFIG_PBLRCW_CONFIG) \
-		-R $(CONFIG_PBLPBI_CONFIG) -T pblimage \
+		$(obj)tools/mkimage -n $(CONFIG_SYS_FSL_PBL_RCW) \
+		-R $(CONFIG_SYS_FSL_PBL_PBI) -T pblimage \
 		-d $< $@
 
 $(obj)u-boot.sha1:	$(obj)u-boot.bin
README +7 -0
index a0646c3..bc481b9 100644
@@ -472,6 +472,13 @@ The following options need to be configured:
 		Board config to use DDR3. It can be enabled for SoCs with
 		Freescale DDR3 controllers.
 
+		CONFIG_SYS_FSL_PBL_PBI
+		CONFIG_SYS_FSL_PBL_RCW
+		Provides a tool to build boot Image for PBL(Pre boot loader)
+		Here PBL can be used to load some instructions and/or data for
+		pre-initialization.
+		Define both configs to enable above feature.
+
 - Intel Monahans options:
 		CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO
 
include/configs/B4860QDS.h +2 -2
index c182158..c667229 100644
@@ -16,8 +16,8 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI	$(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW	$(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
include/configs/P2041RDB.h +3 -2
index ee71252..2b81cbe 100644
@@ -18,8 +18,9 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/corenet_ds/rcw_p2041rdb.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW \
+			$(SRCTREE)/board/freescale/corenet_ds/rcw_p2041rdb.cfg
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
include/configs/T1040QDS.h +2 -2
index 7d0bc04..74d8049 100644
@@ -32,8 +32,8 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/t1040qds/t1040_pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/t1040qds/t1040_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t1040qds/t1040_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t1040qds/t1040_rcw.cfg
 #endif
 
 /* High Level Configuration Options */
include/configs/T2080QDS.h +2 -2
index bff001f..b35e107 100644
@@ -45,8 +45,8 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/t2080qds/t2080_pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/t2080qds/t2080_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t2080qds/t2080_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t2080qds/t2080_rcw.cfg
 #endif
 
 #define CONFIG_SRIO_PCIE_BOOT_MASTER
include/configs/T4240QDS.h +2 -2
index c96df54..1f1177b 100644
@@ -21,8 +21,8 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/t4qds/t4_pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/t4qds/t4_rcw.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/t4qds/t4_pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t4qds/t4_rcw.cfg
 #endif
 
 #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE
include/configs/corenet_ds.h +9 -5
index 969b990..3a1826d 100644
@@ -15,15 +15,19 @@
 #ifdef CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/corenet_ds/pbi.cfg
 #if defined(CONFIG_P3041DS)
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/corenet_ds/rcw_p3041ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW \
+			$(SRCTREE)/board/freescale/corenet_ds/rcw_p3041ds.cfg
 #elif defined(CONFIG_P4080DS)
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/corenet_ds/rcw_p4080ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW \
+			$(SRCTREE)/board/freescale/corenet_ds/rcw_p4080ds.cfg
 #elif defined(CONFIG_P5020DS)
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/corenet_ds/rcw_p5020ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW \
+			$(SRCTREE)/board/freescale/corenet_ds/rcw_p5020ds.cfg
 #elif defined(CONFIG_P5040DS)
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/freescale/corenet_ds/rcw_p5040ds.cfg
+#define CONFIG_SYS_FSL_PBL_RCW \
+			$(SRCTREE)/board/freescale/corenet_ds/rcw_p5040ds.cfg
 #endif
 #endif
 
include/configs/km/kmp204x-common.h +2 -2
index 50330cc..0463fcb 100644
@@ -24,8 +24,8 @@
 #define CONFIG_RAMBOOT_PBL
 #define CONFIG_RAMBOOT_TEXT_BASE	CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS	0xfffffffc
-#define CONFIG_PBLPBI_CONFIG $(SRCTREE)/board/keymile/kmp204x/pbi.cfg
-#define CONFIG_PBLRCW_CONFIG $(SRCTREE)/board/keymile/kmp204x/rcw_kmp204x.cfg
+#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/keymile/kmp204x/pbi.cfg
+#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/keymile/kmp204x/rcw_kmp204x.cfg
 
 /* High Level Configuration Options */
 #define CONFIG_BOOKE
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Dear Prabhakar Kushwaha,

Quoted 1 line · In message <[email protected]> you…

Rename CONFIG_PBLRCW_CONFIG and CONFIG_PBLRCW_CONFIG.

What is the reason for the reenaming? Especially, why changing from CONFIG_ to CONFIG_SYS_ ?

Quoted 1 line

Also add their details in README.

...

README The following options need to be configured: · line 480

Quoted 6 lines
README +6 -0
+		CONFIG_SYS_FSL_PBL_PBI
+		CONFIG_SYS_FSL_PBL_RCW
+		Provides a tool to build boot Image for PBL(Pre boot loader)
+		Here PBL can be used to load some instructions and/or data for
+		pre-initialization.
+		Define both configs to enable above feature.

Hm...This does not really explain what CONFIG_SYS_FSL_PBL_PBI or CONFIG_SYS_FSL_PBL_RCW actually means.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Houston, Tranquillity Base here.  The Eagle has landed.
                                                    -- Neil Armstrong
#2 lore raw

PATCH 1/1 powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Thanks Wolfgang for reviewing this patch.
Please find my reply in-lined

Quoted 6 lines · Wolfgang Denk

Dear Prabhakar Kushwaha,

Quoted 1 line · In message <[email protected]> you…

Rename CONFIG_PBLRCW_CONFIG and CONFIG_PBLRCW_CONFIG.

What is the reason for the reenaming? Especially, why changing from CONFIG_ to CONFIG_SYS_ ?

CONFIG_PBLRCW_CONFIG has 2 CONFIG. it is slightly confusing.

Reason for moving CONFIG_ to CONFIG_SYS: These defines enables of adding RCW(power on reset configuration) and
PBI(pre boot loader commands) in u-boot image. These information will be used by SoC hardware for NAND, SD, SPI boot.
As these configuration will be used by SoC hardware. I thought of adding CONFIG_SYS.

Please let me know, if I need to rename it again.

Quoted 13 lines
Quoted 1 line

Also add their details in README.

...

README The following options need to be configured: · line 480

Quoted 6 lines
README +6 -0
+		CONFIG_SYS_FSL_PBL_PBI
+		CONFIG_SYS_FSL_PBL_RCW
+		Provides a tool to build boot Image for PBL(Pre boot loader)
+		Here PBL can be used to load some instructions and/or data for
+		pre-initialization.
+		Define both configs to enable above feature.

Hm...This does not really explain what CONFIG_SYS_FSL_PBL_PBI or CONFIG_SYS_FSL_PBL_RCW actually means.

You are right. Let me correct it.

Thanks,
Prabhakar

#3 lore raw

PATCH 1/1 powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Dear Prabhakar,

Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 3 lines

What is the reason for the reenaming? Especially, why changing from CONFIG_ to CONFIG_SYS_ ?

Quoted 8 lines

CONFIG_PBLRCW_CONFIG has 2 CONFIG. it is slightly confusing.

Reason for moving CONFIG_ to CONFIG_SYS: These defines enables of adding RCW(power on reset configuration) and
PBI(pre boot loader commands) in u-boot image. These information will be used by SoC hardware for NAND, SD, SPI boot.
As these configuration will be used by SoC hardware. I thought of adding CONFIG_SYS.

CONFIG_ means stuff that can be freely adjusted by the end user to match his likings, like adding one command and removing another. CONFIG_SYS_ means stuff that is determined by the hardware configuration, i. e. that has to be adjusted according to specific properties to make U-Boot working on some hardware, and which can (or should) not be "adjusted" by the end user.

I don;t understand your intentions enough to say which applies here; IIRC at least PBI might be more of the CONFIG_ type.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
How many hardware guys does it take to change a light bulb? "Well the
diagnostics say it's fine buddy, so it's a software problem."
#4 lore raw

PATCH 1/1 powerpc:Rename CONFIG_PBLRCW_CONFIG & CONFIG_SYS_FSL_PBL_PBI

Quoted 23 lines · Wolfgang Denk

Dear Prabhakar,

Quoted 4 lines · In message <[email protected]> you wrote:
Quoted 3 lines

What is the reason for the reenaming? Especially, why changing from CONFIG_ to CONFIG_SYS_ ?

Quoted 8 lines

CONFIG_PBLRCW_CONFIG has 2 CONFIG. it is slightly confusing.

Reason for moving CONFIG_ to CONFIG_SYS: These defines enables of adding RCW(power on reset configuration) and
PBI(pre boot loader commands) in u-boot image. These information will be used by SoC hardware for NAND, SD, SPI boot.
As these configuration will be used by SoC hardware. I thought of adding CONFIG_SYS.

CONFIG_ means stuff that can be freely adjusted by the end user to match his likings, like adding one command and removing another. CONFIG_SYS_ means stuff that is determined by the hardware configuration, i. e. that has to be adjusted according to specific properties to make U-Boot working on some hardware, and which can (or should) not be "adjusted" by the end user.

Quoted 2 lines

I don;t understand your intentions enough to say which applies here; IIRC at least PBI might be more of the CONFIG_ type.

I think they belong in CONFIG_SYS -- they can be adjusted to some extent if you know what you're doing, but they are not general user knobs. As far as end users are concerned, they should use the PBI/PBL files that match their hardware. The PBI file will mainly contain errata workarounds, and/or hardware initialization necessary for certain types of non-NOR booting (the user knob in the latter case is elsewhere, to tell U-Boot what boot source to target).

-Scott