diff mbox

[U-Boot,v2] MIPS: provide a default u-boot-spl.lds

Message ID 1464269318-8039-1-git-send-email-daniel.schwierzeck@gmail.com
State Accepted
Commit 07f5b966aa2a4fe3a9bed8e90103cb0fe83c8748
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Daniel Schwierzeck May 26, 2016, 1:28 p.m. UTC 
Provide a default linker script for SPL binaries. Start address
and size of text section and BSS section are configurable. All
sections are arranged in a way that only relevant sections are
kept in the code section for maximum size reduction. All other
sections are kept but moved outside the code section to help
with debugging.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>

---

Changes in v2:
- add missing section .u_boot_list

 arch/mips/config.mk          |  5 ++-
 arch/mips/cpu/u-boot-spl.lds | 90 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 arch/mips/cpu/u-boot-spl.lds

Comments

Marek Vasut May 26, 2016, 3:17 p.m. UTC | #1 
On 05/26/2016 03:28 PM, Daniel Schwierzeck wrote:
> Provide a default linker script for SPL binaries. Start address
> and size of text section and BSS section are configurable. All
> sections are arranged in a way that only relevant sections are
> kept in the code section for maximum size reduction. All other
> sections are kept but moved outside the code section to help
> with debugging.
> 
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> 
> ---
> 
> Changes in v2:
> - add missing section .u_boot_list
> 
>  arch/mips/config.mk          |  5 ++-
>  arch/mips/cpu/u-boot-spl.lds | 90 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+), 2 deletions(-)
>  create mode 100644 arch/mips/cpu/u-boot-spl.lds
> 
> diff --git a/arch/mips/config.mk b/arch/mips/config.mk
> index 609a998..dcd3460 100644
> --- a/arch/mips/config.mk
> +++ b/arch/mips/config.mk
> @@ -65,7 +65,7 @@ else
>  PF_ABICALLS			:= -mabicalls
>  PF_PIC				:= -fpic
>  PF_PIE				:= -pie
> -PF_OBJCOPY			:= -j .got -j .u_boot_list -j .rel.dyn -j .padding
> +PF_OBJCOPY			:= -j .got -j .rel.dyn -j .padding
>  PF_OBJCOPY			+= -j .dtb.init.rodata
>  endif
>  
> @@ -74,4 +74,5 @@ PLATFORM_CPPFLAGS		+= -msoft-float
>  PLATFORM_LDFLAGS		+= -G 0 -static -n -nostdlib
>  PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
>  LDFLAGS_FINAL			+= --gc-sections $(PF_PIE)
> -OBJCOPYFLAGS			+= -j .text -j .rodata -j .data $(PF_OBJCOPY)
> +OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j .u_boot_list
> +OBJCOPYFLAGS			+= $(PF_OBJCOPY)
> diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds
> new file mode 100644
> index 0000000..07004ea
> --- /dev/null
> +++ b/arch/mips/cpu/u-boot-spl.lds
> @@ -0,0 +1,90 @@
> +/*
> + * SPDX-License-Identifier:	GPL-2.0+
> + */
> +
> +MEMORY { .spl_mem : ORIGIN = CONFIG_SPL_TEXT_BASE, \
> +		LENGTH = CONFIG_SPL_MAX_SIZE }
> +MEMORY { .bss_mem : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
> +		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
> +
> +OUTPUT_ARCH(mips)
> +ENTRY(_start)
> +SECTIONS
> +{
> +	. = 0x00000000;
> +
> +	. = ALIGN(4);
> +	.text : {
> +		*(.text*)
> +	} > .spl_mem
> +
> +	. = ALIGN(4);
> +	.rodata : {
> +		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
> +	} > .spl_mem
> +
> +	. = ALIGN(4);
> +	.data : {
> +		*(SORT_BY_ALIGNMENT(.data*))
> +		*(SORT_BY_ALIGNMENT(.sdata*))
> +	} > .spl_mem
> +
> +#ifdef CONFIG_SPL_DM

Is the ifdef really necessary ? I think if the list is empty, the
u_boot_list will just be an zero-length symbol and since both this and
the image_copy_end are 4-byte aligned, there will be no wasted space.

> +	. = ALIGN(4);
> +	.u_boot_list : {
> +		KEEP(*(SORT(.u_boot_list*)));
> +	} > .spl_mem
> +#endif
> +
> +	. = ALIGN(4);
> +	__image_copy_end = .;
> +
> +	.bss (NOLOAD) : {
> +		__bss_start = .;
> +		*(.bss*)
> +		*(.sbss*)
> +		*(COMMON)
> +		. = ALIGN(4);
> +		__bss_end = .;
> +	} > .bss_mem
> +
> +	.rel.dyn (NOLOAD) : {
> +		*(.rel.dyn)
> +	}
> +
> +	.dynsym : {
> +		*(.dynsym)
> +	}
> +
> +	.dynbss : {
> +		*(.dynbss)
> +	}
> +
> +	.dynstr : {
> +		*(.dynstr)
> +	}
> +
> +	.dynamic : {
> +		*(.dynamic)
> +	}
> +
> +	.plt : {
> +		*(.plt)
> +	}
> +
> +	.interp : {
> +		*(.interp)
> +	}
> +
> +	.gnu : {
> +		*(.gnu*)
> +	}
> +
> +	.MIPS.stubs : {
> +		*(.MIPS.stubs)
> +	}
> +
> +	.hash : {
> +		*(.hash)
> +	}
> +}
>
Daniel Schwierzeck May 27, 2016, 10:03 a.m. UTC | #2 
Am 26.05.2016 um 17:17 schrieb Marek Vasut:
> On 05/26/2016 03:28 PM, Daniel Schwierzeck wrote:
>> Provide a default linker script for SPL binaries. Start address
>> and size of text section and BSS section are configurable. All
>> sections are arranged in a way that only relevant sections are
>> kept in the code section for maximum size reduction. All other
>> sections are kept but moved outside the code section to help
>> with debugging.
>>
>> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>>
>> ---
>>
>> Changes in v2:
>> - add missing section .u_boot_list
>>
>>  arch/mips/config.mk          |  5 ++-
>>  arch/mips/cpu/u-boot-spl.lds | 90 ++++++++++++++++++++++++++++++++++++++++++++
>>  2 files changed, 93 insertions(+), 2 deletions(-)
>>  create mode 100644 arch/mips/cpu/u-boot-spl.lds
>>
>> diff --git a/arch/mips/config.mk b/arch/mips/config.mk
>> index 609a998..dcd3460 100644
>> --- a/arch/mips/config.mk
>> +++ b/arch/mips/config.mk
>> @@ -65,7 +65,7 @@ else
>>  PF_ABICALLS			:= -mabicalls
>>  PF_PIC				:= -fpic
>>  PF_PIE				:= -pie
>> -PF_OBJCOPY			:= -j .got -j .u_boot_list -j .rel.dyn -j .padding
>> +PF_OBJCOPY			:= -j .got -j .rel.dyn -j .padding
>>  PF_OBJCOPY			+= -j .dtb.init.rodata
>>  endif
>>  
>> @@ -74,4 +74,5 @@ PLATFORM_CPPFLAGS		+= -msoft-float
>>  PLATFORM_LDFLAGS		+= -G 0 -static -n -nostdlib
>>  PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
>>  LDFLAGS_FINAL			+= --gc-sections $(PF_PIE)
>> -OBJCOPYFLAGS			+= -j .text -j .rodata -j .data $(PF_OBJCOPY)
>> +OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j .u_boot_list
>> +OBJCOPYFLAGS			+= $(PF_OBJCOPY)
>> diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds
>> new file mode 100644
>> index 0000000..07004ea
>> --- /dev/null
>> +++ b/arch/mips/cpu/u-boot-spl.lds
>> @@ -0,0 +1,90 @@
>> +/*
>> + * SPDX-License-Identifier:	GPL-2.0+
>> + */
>> +
>> +MEMORY { .spl_mem : ORIGIN = CONFIG_SPL_TEXT_BASE, \
>> +		LENGTH = CONFIG_SPL_MAX_SIZE }
>> +MEMORY { .bss_mem : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
>> +		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
>> +
>> +OUTPUT_ARCH(mips)
>> +ENTRY(_start)
>> +SECTIONS
>> +{
>> +	. = 0x00000000;
>> +
>> +	. = ALIGN(4);
>> +	.text : {
>> +		*(.text*)
>> +	} > .spl_mem
>> +
>> +	. = ALIGN(4);
>> +	.rodata : {
>> +		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
>> +	} > .spl_mem
>> +
>> +	. = ALIGN(4);
>> +	.data : {
>> +		*(SORT_BY_ALIGNMENT(.data*))
>> +		*(SORT_BY_ALIGNMENT(.sdata*))
>> +	} > .spl_mem
>> +
>> +#ifdef CONFIG_SPL_DM
> 
> Is the ifdef really necessary ? I think if the list is empty, the
> u_boot_list will just be an zero-length symbol and since both this and
> the image_copy_end are 4-byte aligned, there will be no wasted space.

yes, I also tested it with your with your CI20 patches. If I disable
CONFIG_SPL_DM, there still is u_boot_list entry from the MMC driver
which would waste 120 Bytes.


> 
>> +	. = ALIGN(4);
>> +	.u_boot_list : {
>> +		KEEP(*(SORT(.u_boot_list*)));
>> +	} > .spl_mem
>> +#endif
>> +
>> +	. = ALIGN(4);
>> +	__image_copy_end = .;
>> +
>> +	.bss (NOLOAD) : {
>> +		__bss_start = .;
>> +		*(.bss*)
>> +		*(.sbss*)
>> +		*(COMMON)
>> +		. = ALIGN(4);
>> +		__bss_end = .;
>> +	} > .bss_mem
>> +
>> +	.rel.dyn (NOLOAD) : {
>> +		*(.rel.dyn)
>> +	}
>> +
>> +	.dynsym : {
>> +		*(.dynsym)
>> +	}
>> +
>> +	.dynbss : {
>> +		*(.dynbss)
>> +	}
>> +
>> +	.dynstr : {
>> +		*(.dynstr)
>> +	}
>> +
>> +	.dynamic : {
>> +		*(.dynamic)
>> +	}
>> +
>> +	.plt : {
>> +		*(.plt)
>> +	}
>> +
>> +	.interp : {
>> +		*(.interp)
>> +	}
>> +
>> +	.gnu : {
>> +		*(.gnu*)
>> +	}
>> +
>> +	.MIPS.stubs : {
>> +		*(.MIPS.stubs)
>> +	}
>> +
>> +	.hash : {
>> +		*(.hash)
>> +	}
>> +}
>>
> 
>
Marek Vasut May 27, 2016, 12:44 p.m. UTC | #3 
On 05/27/2016 12:03 PM, Daniel Schwierzeck wrote:
> 
> 
> Am 26.05.2016 um 17:17 schrieb Marek Vasut:
>> On 05/26/2016 03:28 PM, Daniel Schwierzeck wrote:
>>> Provide a default linker script for SPL binaries. Start address
>>> and size of text section and BSS section are configurable. All
>>> sections are arranged in a way that only relevant sections are
>>> kept in the code section for maximum size reduction. All other
>>> sections are kept but moved outside the code section to help
>>> with debugging.
>>>
>>> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>>>
>>> ---
>>>
>>> Changes in v2:
>>> - add missing section .u_boot_list
>>>
>>>  arch/mips/config.mk          |  5 ++-
>>>  arch/mips/cpu/u-boot-spl.lds | 90 ++++++++++++++++++++++++++++++++++++++++++++
>>>  2 files changed, 93 insertions(+), 2 deletions(-)
>>>  create mode 100644 arch/mips/cpu/u-boot-spl.lds
>>>
>>> diff --git a/arch/mips/config.mk b/arch/mips/config.mk
>>> index 609a998..dcd3460 100644
>>> --- a/arch/mips/config.mk
>>> +++ b/arch/mips/config.mk
>>> @@ -65,7 +65,7 @@ else
>>>  PF_ABICALLS			:= -mabicalls
>>>  PF_PIC				:= -fpic
>>>  PF_PIE				:= -pie
>>> -PF_OBJCOPY			:= -j .got -j .u_boot_list -j .rel.dyn -j .padding
>>> +PF_OBJCOPY			:= -j .got -j .rel.dyn -j .padding
>>>  PF_OBJCOPY			+= -j .dtb.init.rodata
>>>  endif
>>>  
>>> @@ -74,4 +74,5 @@ PLATFORM_CPPFLAGS		+= -msoft-float
>>>  PLATFORM_LDFLAGS		+= -G 0 -static -n -nostdlib
>>>  PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
>>>  LDFLAGS_FINAL			+= --gc-sections $(PF_PIE)
>>> -OBJCOPYFLAGS			+= -j .text -j .rodata -j .data $(PF_OBJCOPY)
>>> +OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j .u_boot_list
>>> +OBJCOPYFLAGS			+= $(PF_OBJCOPY)
>>> diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds
>>> new file mode 100644
>>> index 0000000..07004ea
>>> --- /dev/null
>>> +++ b/arch/mips/cpu/u-boot-spl.lds
>>> @@ -0,0 +1,90 @@
>>> +/*
>>> + * SPDX-License-Identifier:	GPL-2.0+
>>> + */
>>> +
>>> +MEMORY { .spl_mem : ORIGIN = CONFIG_SPL_TEXT_BASE, \
>>> +		LENGTH = CONFIG_SPL_MAX_SIZE }
>>> +MEMORY { .bss_mem : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
>>> +		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
>>> +
>>> +OUTPUT_ARCH(mips)
>>> +ENTRY(_start)
>>> +SECTIONS
>>> +{
>>> +	. = 0x00000000;
>>> +
>>> +	. = ALIGN(4);
>>> +	.text : {
>>> +		*(.text*)
>>> +	} > .spl_mem
>>> +
>>> +	. = ALIGN(4);
>>> +	.rodata : {
>>> +		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
>>> +	} > .spl_mem
>>> +
>>> +	. = ALIGN(4);
>>> +	.data : {
>>> +		*(SORT_BY_ALIGNMENT(.data*))
>>> +		*(SORT_BY_ALIGNMENT(.sdata*))
>>> +	} > .spl_mem
>>> +
>>> +#ifdef CONFIG_SPL_DM
>>
>> Is the ifdef really necessary ? I think if the list is empty, the
>> u_boot_list will just be an zero-length symbol and since both this and
>> the image_copy_end are 4-byte aligned, there will be no wasted space.
> 
> yes, I also tested it with your with your CI20 patches. If I disable
> CONFIG_SPL_DM, there still is u_boot_list entry from the MMC driver
> which would waste 120 Bytes.

Awwwww, precious 120 bytes. Ok, keep this as is:

Acked-by: Marek Vasut <marex@denx.de>

>>> +	. = ALIGN(4);
>>> +	.u_boot_list : {
>>> +		KEEP(*(SORT(.u_boot_list*)));
>>> +	} > .spl_mem
>>> +#endif
>>> +
>>> +	. = ALIGN(4);
>>> +	__image_copy_end = .;
>>> +
>>> +	.bss (NOLOAD) : {
>>> +		__bss_start = .;
>>> +		*(.bss*)
>>> +		*(.sbss*)
>>> +		*(COMMON)
>>> +		. = ALIGN(4);
>>> +		__bss_end = .;
>>> +	} > .bss_mem
>>> +
>>> +	.rel.dyn (NOLOAD) : {
>>> +		*(.rel.dyn)
>>> +	}
>>> +
>>> +	.dynsym : {
>>> +		*(.dynsym)
>>> +	}
>>> +
>>> +	.dynbss : {
>>> +		*(.dynbss)
>>> +	}
>>> +
>>> +	.dynstr : {
>>> +		*(.dynstr)
>>> +	}
>>> +
>>> +	.dynamic : {
>>> +		*(.dynamic)
>>> +	}
>>> +
>>> +	.plt : {
>>> +		*(.plt)
>>> +	}
>>> +
>>> +	.interp : {
>>> +		*(.interp)
>>> +	}
>>> +
>>> +	.gnu : {
>>> +		*(.gnu*)
>>> +	}
>>> +
>>> +	.MIPS.stubs : {
>>> +		*(.MIPS.stubs)
>>> +	}
>>> +
>>> +	.hash : {
>>> +		*(.hash)
>>> +	}
>>> +}
>>>
>>
>>
>
Daniel Schwierzeck May 30, 2016, 9:48 a.m. UTC | #4 
Am 26.05.2016 um 15:28 schrieb Daniel Schwierzeck:
> Provide a default linker script for SPL binaries. Start address
> and size of text section and BSS section are configurable. All
> sections are arranged in a way that only relevant sections are
> kept in the code section for maximum size reduction. All other
> sections are kept but moved outside the code section to help
> with debugging.
> 
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> 
> ---
> 
> Changes in v2:
> - add missing section .u_boot_list
> 
>  arch/mips/config.mk          |  5 ++-
>  arch/mips/cpu/u-boot-spl.lds | 90 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 93 insertions(+), 2 deletions(-)
>  create mode 100644 arch/mips/cpu/u-boot-spl.lds
> 

applied to u-boot-mips
diff mbox

Patch

diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 609a998..dcd3460 100644
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -65,7 +65,7 @@  else
 PF_ABICALLS			:= -mabicalls
 PF_PIC				:= -fpic
 PF_PIE				:= -pie
-PF_OBJCOPY			:= -j .got -j .u_boot_list -j .rel.dyn -j .padding
+PF_OBJCOPY			:= -j .got -j .rel.dyn -j .padding
 PF_OBJCOPY			+= -j .dtb.init.rodata
 endif
 
@@ -74,4 +74,5 @@  PLATFORM_CPPFLAGS		+= -msoft-float
 PLATFORM_LDFLAGS		+= -G 0 -static -n -nostdlib
 PLATFORM_RELFLAGS		+= -ffunction-sections -fdata-sections
 LDFLAGS_FINAL			+= --gc-sections $(PF_PIE)
-OBJCOPYFLAGS			+= -j .text -j .rodata -j .data $(PF_OBJCOPY)
+OBJCOPYFLAGS			+= -j .text -j .rodata -j .data -j .u_boot_list
+OBJCOPYFLAGS			+= $(PF_OBJCOPY)
diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds
new file mode 100644
index 0000000..07004ea
--- /dev/null
+++ b/arch/mips/cpu/u-boot-spl.lds
@@ -0,0 +1,90 @@ 
+/*
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+MEMORY { .spl_mem : ORIGIN = CONFIG_SPL_TEXT_BASE, \
+		LENGTH = CONFIG_SPL_MAX_SIZE }
+MEMORY { .bss_mem : ORIGIN = CONFIG_SPL_BSS_START_ADDR, \
+		LENGTH = CONFIG_SPL_BSS_MAX_SIZE }
+
+OUTPUT_ARCH(mips)
+ENTRY(_start)
+SECTIONS
+{
+	. = 0x00000000;
+
+	. = ALIGN(4);
+	.text : {
+		*(.text*)
+	} > .spl_mem
+
+	. = ALIGN(4);
+	.rodata : {
+		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+	} > .spl_mem
+
+	. = ALIGN(4);
+	.data : {
+		*(SORT_BY_ALIGNMENT(.data*))
+		*(SORT_BY_ALIGNMENT(.sdata*))
+	} > .spl_mem
+
+#ifdef CONFIG_SPL_DM
+	. = ALIGN(4);
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	} > .spl_mem
+#endif
+
+	. = ALIGN(4);
+	__image_copy_end = .;
+
+	.bss (NOLOAD) : {
+		__bss_start = .;
+		*(.bss*)
+		*(.sbss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end = .;
+	} > .bss_mem
+
+	.rel.dyn (NOLOAD) : {
+		*(.rel.dyn)
+	}
+
+	.dynsym : {
+		*(.dynsym)
+	}
+
+	.dynbss : {
+		*(.dynbss)
+	}
+
+	.dynstr : {
+		*(.dynstr)
+	}
+
+	.dynamic : {
+		*(.dynamic)
+	}
+
+	.plt : {
+		*(.plt)
+	}
+
+	.interp : {
+		*(.interp)
+	}
+
+	.gnu : {
+		*(.gnu*)
+	}
+
+	.MIPS.stubs : {
+		*(.MIPS.stubs)
+	}
+
+	.hash : {
+		*(.hash)
+	}
+}