Skip to contentSkip to conversation

spl: arm: Make sure to include u_boot_list_*_part_disk_*

PATCH Superseded Tom Rini 4 participants 4 messages Mar 15, 2016

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Zynq architecture

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 spl: arm: Make sure to include u_boot_list_*_part_disk_*

Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well.

Cc Nishanth Menon <[email protected]>
Cc Michal Simek <[email protected]>
Cc Simon Glass <[email protected]>
Reported-by Nishanth Menon <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds |    1 +
 arch/arm/cpu/u-boot-spl.lds                   |    1 +
 arch/arm/mach-zynq/u-boot-spl.lds             |    5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +1 -0
index ccd0c83..9dccdc0 100644
@@ -35,6 +35,7 @@ SECTIONS
 
 	. = ALIGN(4);
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	} >.sram
arch/arm/cpu/u-boot-spl.lds +1 -0
index c5b4f7c..1805043 100644
@@ -40,6 +40,7 @@ SECTIONS
 #endif
 	. = .;
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	}
arch/arm/mach-zynq/u-boot-spl.lds +3 -2
index ecdf6a0..6ea7996 100644
@@ -38,14 +38,15 @@ SECTIONS
 	} > .sram
 
 	. = ALIGN(4);
-#ifdef CONFIG_SPL_DM
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
+#ifdef CONFIG_SPL_DM
 		KEEP(*(SORT(.u_boot_list_*_driver_*)));
 		KEEP(*(SORT(.u_boot_list_*_uclass_*)));
+#endif
 	} > .sram
 
 	. = ALIGN(4);
-#endif
 
 	. = .;
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 spl: arm: Make sure to include u_boot_list_*_part_disk_*

Quoted 10 lines · Tom Rini

Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well.

Cc Nishanth Menon <[email protected]>
Cc Michal Simek <[email protected]>
Cc Simon Glass <[email protected]>
Reported-by Nishanth Menon <[email protected]>
Signed-off-by Tom Rini <[email protected]>
Quoted 5 lines
---
 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds |    1 +
 arch/arm/cpu/u-boot-spl.lds                   |    1 +
 arch/arm/mach-zynq/u-boot-spl.lds             |    5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)
Reviewed-by Simon Glass <[email protected]>
#2 lore raw

PATCH 1/1 spl: arm: Make sure to include u_boot_list_*_part_disk_*

In reply to Tom Rini
Quoted 8 lines · Tom Rini

Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well.

Cc Nishanth Menon <[email protected]>
Cc Michal Simek <[email protected]>
Cc Simon Glass <[email protected]>
Reported-by Nishanth Menon <[email protected]>
Tested-by Nishanth Menon <[email protected]>

Thanks for the patch..

Signature · 2 lines
Regards,
Nishanth Menon
#3 lore raw

PATCH 1/1 spl: arm: Make sure to include u_boot_list_*_part_disk_*

In reply to Tom Rini
Quoted 44 lines · Tom Rini

Starting with 96e5b03 we use a linker list for partition table information. However since we use this in SPL we need to make sure that the SPL linker scripts include these as well.

Cc Nishanth Menon <[email protected]>
Cc Michal Simek <[email protected]>
Cc Simon Glass <[email protected]>
Reported-by Nishanth Menon <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 arch/arm/cpu/armv7/omap-common/u-boot-spl.lds |    1 +
 arch/arm/cpu/u-boot-spl.lds                   |    1 +
 arch/arm/mach-zynq/u-boot-spl.lds             |    5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/cpu/armv7/omap-common/u-boot-spl.lds +1 -0
index ccd0c83..9dccdc0 100644
@@ -35,6 +35,7 @@ SECTIONS
 
 	. = ALIGN(4);
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	} >.sram
arch/arm/cpu/u-boot-spl.lds +1 -0
index c5b4f7c..1805043 100644
@@ -40,6 +40,7 @@ SECTIONS
 #endif
 	. = .;
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
 		KEEP(*(SORT(.u_boot_list*_i2c_*)));
 	}
arch/arm/mach-zynq/u-boot-spl.lds +0 -0
index ecdf6a0..6ea7996 100644

arch/arm/mach-zynq/u-boot-spl.lds SECTIONS · line 43

Quoted 7 lines
arch/arm/mach-zynq/u-boot-spl.lds +2 -1
@@ -38,14 +38,15 @@ SECTIONS
 	} > .sram
 
 	. = ALIGN(4);
-#ifdef CONFIG_SPL_DM
 	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_part_driver_*)));
+#ifdef CONFIG_SPL_DM

Please remove this CONFIG. Zynq defines them by default.

Thanks,
Michal