x86: Move x86 to use board_init_f_mem() instead of assembler

This is declared but no-longer exists. Drop it.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/include/asm/u-boot-x86.h | 1 -
 1 file changed, 1 deletion(-)

arch/x86/include/asm/u-boot-x86.h +0 -0

index 4dae365..1c459d5 100644

Some archs like to have larger alignment for their global data. Use 16 bytes which suits all current archs.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c                  | 2 +-
 include/asm-generic/global_data.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

common/board_f.c +0 -0

index c596083..a947770 100644

common/board_f.c +0 -0

        gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
        debug("Reserving %zu Bytes for Global Data at: %08lx\n",
                        sizeof(gd_t), gd->start_addr_sp);

include/asm-generic/global_data.h +0 -0

index 2155265..147f646 100644

At present we have a simple assignment to gd. With some archs this is implemented as a register or through some other means; a simple assignment does not suit in all cases.

Change this to a function and add documentation to describe how this all works.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c | 14 +++++++++++---
 include/common.h | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

common/board_f.c +11 -3

index a947770..3d1f305 100644
@@ -1024,15 +1024,23 @@ void board_init_f_r(void)
 #endif /* CONFIG_X86 */
 
 #ifndef CONFIG_X86
-ulong board_init_f_mem(ulong top)
+__weak void arch_setup_gdt(struct global_data *gd_ptr)
 {
+	gd = gd_ptr;
+}
+
+ulong board_init_f_mem(ulong top, ulong reserve_size)
+{
+	struct global_data *gd_ptr;
+
 	/* Leave space for the stack we are running with now */
 	top -= 0x40;
 
 	top -= sizeof(struct global_data);
 	top = ALIGN(top, 16);
-	gd = (struct global_data *)top;
-	memset((void *)gd, '\0', sizeof(*gd));
+	gd_ptr = (struct global_data *)top;
+	memset(gd_ptr, '\0', sizeof(*gd));
+	arch_setup_gdt(gd_ptr);
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 	top -= CONFIG_SYS_MALLOC_F_LEN;

include/common.h +33 -0

index fcc9ae7..029eb1f 100644
@@ -217,6 +217,46 @@ extern char console_buffer[];
 /* arch/$(ARCH)/lib/board.c */
 void board_init_f(ulong);
 void board_init_r(gd_t *, ulong) __attribute__ ((noreturn));
+
+/**
+ * board_init_f_mem() - Allocate global data and set stack position
+ *
+ * This function is called by each architecture very early in the start-up
+ * code to set up the environment for board_init_f(). It allocates space for
+ * global_data (see include/asm-generic/global_data.h) and places the stack
+ * below this.
+ *
+ * This function requires a stack[1] Normally this is at @top. The function
+ * starts allocating space from 64 bytes below @top. First it creates space
+ * for global_data. then it calls arch_setup_gd() which sets gd to point to
+ * the global_data space and can reserve additional bytes of space if
+ * required). Finally it allocates early malloc() memory
+ * (CONFIG_SYS_MALLOC_F_LEN). The new top of the stack is just below this,
+ * and it returned by this function.
+ *
+ * [1] Strictly speaking it would be possible to implement this function
+ * in C on many archs such that it does not require a stack. However this
+ * does not seem hugely important as only 64 byte are wasted.
+ *
+ * @top:	Top of available memory, also normally the top of the stack
+ * @return:	New stack location
+ */
+ulong board_init_f_mem(ulong top, ulong reserve_size);
+
+/**
+ * arch_setup_gdt() - Set up the global_data pointer
+ *
+ * This pointer is special in some architectures and cannot easily be assigned
+ * to. For example on x86 it is implemented by adding a specific record to its
+ * Global Descriptor Table! So we we provide a function to carry out this task.
+ * For most architectures this can simply be:

At present we have a simple assignment to gd. With some archs this is implemented as a register or through some other means; a simple assignment does not suit in all cases.

Change this to a function and add documentation to describe how this all works.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c | 14 +++++++++++---
 include/common.h | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

common/board_f.c +0 -0

index a947770..3d1f305 100644

common/board_f.c +0 -0

 #ifdef CONFIG_SYS_MALLOC_F_LEN
        top -= CONFIG_SYS_MALLOC_F_LEN;

include/common.h +2 -0

index fcc9ae7..029eb1f 100644
@@ -217,6 +217,46 @@ extern char console_buffer[];
 /* arch/$(ARCH)/lib/board.c */
 void board_init_f(ulong);
 void board_init_r(gd_t *, ulong) __attribute__ ((noreturn));
+
+/**

include/common.h +9 -0

+
+/**
+ * arch_setup_gdt() - Set up the global_data pointer
+ *
+ * This pointer is special in some architectures and cannot easily be assigned
+ * to. For example on x86 it is implemented by adding a specific record to its
+ * Global Descriptor Table! So we we provide a function to carry out this task.
+ * For most architectures this can simply be:
+ *

Hi Simon,

Quoted 21 lines · Simon Glass

At present we have a simple assignment to gd. With some archs this is implemented as a register or through some other means; a simple assignment does not suit in all cases.

Change this to a function and add documentation to describe how this all works.

Signed-off-by Simon Glass <[email protected]>

---

 common/board_f.c | 14 +++++++++++---
 include/common.h | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

common/board_f.c +0 -0

index a947770..3d1f305 100644
@@ -1024,15 +1024,23 @@ void board_init_f_r(void)
 #endif /* CONFIG_X86 */
 

common/board_f.c void board_init_f_r(void) · line 1032

Quoted 8 lines

common/board_f.c +5 -1

 #ifndef CONFIG_X86
-ulong board_init_f_mem(ulong top)
+__weak void arch_setup_gdt(struct global_data *gd_ptr)
 {
+       gd = gd_ptr;
+}
+
+ulong board_init_f_mem(ulong top, ulong reserve_size)

What is reserve_size? I don't see it is used by this function. If we change the signature, we need also update arc and ppc4xx start.S otherwise they will break.

Quoted 7 lines

common/board_f.c +3 -0

+{
+       struct global_data *gd_ptr;
+
        /* Leave space for the stack we are running with now */
        top -= 0x40;
 

common/board_f.c void board_init_f_r(void) · line 1043

Quoted 7 lines

common/board_f.c +3 -2

        top -= sizeof(struct global_data);
        top = ALIGN(top, 16);
-       gd = (struct global_data *)top;
-       memset((void *)gd, '\0', sizeof(*gd));
+       gd_ptr = (struct global_data *)top;
+       memset(gd_ptr, '\0', sizeof(*gd));
+       arch_setup_gdt(gd_ptr);

gdt? Should be just arch_setup_gd()?

Quoted 14 lines

common/board_f.c +0 -0

 #ifdef CONFIG_SYS_MALLOC_F_LEN
        top -= CONFIG_SYS_MALLOC_F_LEN;

include/common.h +2 -0

index fcc9ae7..029eb1f 100644
@@ -217,6 +217,46 @@ extern char console_buffer[];
 /* arch/$(ARCH)/lib/board.c */
 void board_init_f(ulong);
 void board_init_r(gd_t *, ulong) __attribute__ ((noreturn));
+
+/**

include/common.h extern char console_buffer[]; · line 231

Quoted 10 lines

include/common.h +10 -0

+ * board_init_f_mem() - Allocate global data and set stack position
+ *
+ * This function is called by each architecture very early in the start-up
+ * code to set up the environment for board_init_f(). It allocates space for
+ * global_data (see include/asm-generic/global_data.h) and places the stack
+ * below this.
+ *
+ * This function requires a stack[1] Normally this is at @top. The function
+ * starts allocating space from 64 bytes below @top. First it creates space
+ * for global_data. then it calls arch_setup_gd() which sets gd to point to

Nits: . -> ,

include/common.h extern char console_buffer[]; · line 239

Quoted 8 lines

include/common.h +8 -0

+ * the global_data space and can reserve additional bytes of space if
+ * required). Finally it allocates early malloc() memory
+ * (CONFIG_SYS_MALLOC_F_LEN). The new top of the stack is just below this,
+ * and it returned by this function.
+ *
+ * [1] Strictly speaking it would be possible to implement this function
+ * in C on many archs such that it does not require a stack. However this
+ * does not seem hugely important as only 64 byte are wasted.

Where is the 64 bytes it uses? I only see a variable gd_ptr on the stack.

include/common.h extern char console_buffer[]; · line 244

Quoted 6 lines

include/common.h +5 -0

+ *
+ * @top:       Top of available memory, also normally the top of the stack
+ * @return:    New stack location
+ */
+ulong board_init_f_mem(ulong top, ulong reserve_size);

I don't like the name board_init_f_mem(). It actually does two things:
creates global data pointer and reserve the early malloc() memory size. Also it looks like it's more like an arch thing instead of a board's. How about setup_gd_f_mem()?

Quoted 15 lines

include/common.h +14 -0

+
+/**
+ * arch_setup_gdt() - Set up the global_data pointer
+ *
+ * This pointer is special in some architectures and cannot easily be assigned
+ * to. For example on x86 it is implemented by adding a specific record to its
+ * Global Descriptor Table! So we we provide a function to carry out this task.
+ * For most architectures this can simply be:
+ *
+ *    gd = gd_ptr;
+ *
+ * @gd_ptr:    Pointer to global data
+ */
+void arch_setup_gdt(gd_t *gd_ptr);

include/common.h extern char console_buffer[];

Quoted 5 lines

include/common.h +1 -1

+
 int checkboard(void);
 int show_board_info(void);
 int checkflash(void);
--

Regards,
Bin

Rather than keeping track of the Global Descriptor Table in its own memory we may as well put it in global_data with everything else. As a first step, stop using the separately allocated GDT.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/cpu.c                 | 9 +++++----
 arch/x86/include/asm/global_data.h | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)

arch/x86/cpu/cpu.c +5 -4

index 129777c..4f57145 100644
@@ -136,9 +136,10 @@ static void load_gdt(const u64 *boot_gdt, u16 num_entries)
        asm volatile("lgdtl %0\n" : : "m" (gdt));
 }
 
-void setup_gdt(gd_t *id, u64 *gdt_addr)
+void setup_gdt(gd_t *new_gd, u64 *gdt_addr)
 {
-       id->arch.gdt = gdt_addr;
+       gdt_addr = new_gd->arch.gdt;
+
        /* CS: code, read/execute, 4 GB, base 0 */
        gdt_addr[X86_GDT_ENTRY_32BIT_CS] = GDT_ENTRY(0xc09b, 0, 0xfffff);
 

@@ -146,9 +147,9 @@ void setup_gdt(gd_t *id, u64 *gdt_addr)
        gdt_addr[X86_GDT_ENTRY_32BIT_DS] = GDT_ENTRY(0xc093, 0, 0xfffff);
 
        /* FS: data, read/write, 4 GB, base (Global Data Pointer) */
-       id->arch.gd_addr = id;
+       new_gd->arch.gd_addr = new_gd;
        gdt_addr[X86_GDT_ENTRY_32BIT_FS] = GDT_ENTRY(0xc093,
-                    (ulong)&id->arch.gd_addr, 0xfffff);
+                    (ulong)&new_gd->arch.gd_addr, 0xfffff);
 
        /* 16-bit CS: code, read/execute, 64 kB, base 0 */
        gdt_addr[X86_GDT_ENTRY_16BIT_CS] = GDT_ENTRY(0x009b, 0, 0x0ffff);

arch/x86/include/asm/global_data.h +3 -0

index f7e3889..35148ab 100644
@@ -10,6 +10,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/processor.h>
+
 enum pei_boot_mode_t {
        PEI_BOOT_NONE = 0,
        PEI_BOOT_SOFT_RESET,

@@ -44,6 +46,7 @@ struct mtrr_request {
 
 /* Architecture-specific global data */
 struct arch_global_data {
+       u64 gdt[X86_GDT_NUM_ENTRIES] __aligned(16);
        struct global_data *gd_addr;    /* Location of Global Data */
        uint8_t x86;                    /* CPU family */
        uint8_t x86_vendor;             /* CPU vendor */

There is quite a bit of assembler code that can be removed if we use the generic global_data setup. Less arch-specific code makes it easier to add new features and maintain the start-up code.

Drop the unneeded code and adjust the hooks in board_f.c to cope.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/cpu.c   |  4 ++-
 arch/x86/cpu/start.S | 86 ++++++----------------------------------------------
 common/board_f.c     |  3 +-
 3 files changed, 15 insertions(+), 78 deletions(-)

arch/x86/cpu/cpu.c +3 -1

index 4f57145..b2e0323 100644
@@ -136,8 +136,10 @@ static void load_gdt(const u64 *boot_gdt, u16 num_entries)
        asm volatile("lgdtl %0\n" : : "m" (gdt));
 }
 
-void setup_gdt(gd_t *new_gd, u64 *gdt_addr)
+void arch_setup_gdt(gd_t *new_gd)
 {
+       u64 *gdt_addr;
+
        gdt_addr = new_gd->arch.gdt;
 
        /* CS: code, read/execute, 4 GB, base 0 */

arch/x86/cpu/start.S +5 -14

index ac711ed..d93bdfc 100644
@@ -104,8 +104,7 @@ car_init_ret:
         *
         * top-> CONFIG_SYS_CAR_ADDR + CONFIG_SYS_CAR_SIZE
         *      MRC area
-        *      global_data
-        *      x86 global descriptor table
+        *      global_data with x86 global descriptor table
         *      early malloc area
         *      stack
         * bottom-> CONFIG_SYS_CAR_ADDR

@@ -120,13 +119,10 @@ car_init_ret:
         * and esi holds the HOB list address returned by the FSP.
         */
 #endif
-
-       /* Reserve space on stack for global data */
-       subl    $GENERATED_GBL_DATA_SIZE, %esp
-
-       /* Align global data to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-       post_code(POST_START_STACK)
+       /* Set up global data */
+       mov     %esp, %eax
+       call    board_init_f_mem
+       mov     %eax, %esp
 
        /*
         * Debug UART is available here although it may not be plumbed out

@@ -137,19 +133,12 @@ car_init_ret:
         * call  printch
         */
 
-       /* Zero the global data since it won't happen later */
-       xorl    %eax, %eax
-       movl    $GENERATED_GBL_DATA_SIZE, %ecx
-       movl    %esp, %edi
-       rep     stosb

arch/x86/cpu/start.S +0 -13

        movl    %esi, (%edx)
 
 skip_hob:

@@ -159,35 +148,10 @@ skip_hob:
        addl    $GD_TABLE, %edx
        movl    %esi, (%edx)
 #endif
-
-       /* Setup first parameter to setup_gdt, pointer to global_data */
-       movl    %esp, %eax
-
-       /* Reserve space for global descriptor table */
-       subl    $X86_GDT_SIZE, %esp
-
-       /* Align temporary global descriptor table to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-       movl    %esp, %ecx
-
-#if defined(CONFIG_SYS_MALLOC_F_LEN)
-       /* Set up the pre-relocation malloc pool */

arch/x86/cpu/start.S +1 -37

        movl    %ebp, (%edx)
 
-       /* Set second parameter to setup_gdt() */
-       movl    %ecx, %edx
-
-       /* Setup global descriptor table so gd->xyz works */
-       call    setup_gdt
-
        /* Set parameter to board_init_f() to boot flags */
        post_code(POST_START_DONE)
        xorl    %eax, %eax

@@ -213,37 +177,7 @@ board_init_f_r_trampoline:
        /* Stack grows down from top of SDRAM */
        movl    %eax, %esp
 
-       /* Reserve space on stack for global data */
-       subl    $GENERATED_GBL_DATA_SIZE, %esp
-
-       /* Align global data to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-
-       /* Setup first parameter to memcpy() and setup_gdt() */
-       movl    %esp, %eax
-
-       /* Setup second parameter to memcpy() */
-       fs movl 0, %edx
-
-       /* Set third parameter to memcpy() */
-       movl    $GENERATED_GBL_DATA_SIZE, %ecx
-
-       /* Copy global data from CAR to SDRAM stack */
-       call    memcpy
-
-       /* Reserve space for global descriptor table */
-       subl    $X86_GDT_SIZE, %esp
-
-       /* Align global descriptor table to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-
-       /* Set second parameter to setup_gdt() */
-       movl    %esp, %edx
-
-       /* Setup global descriptor table so gd->xyz works */
-       call    setup_gdt
-
-       /* Set if we need to disable CAR */
+       /* See if we need to disable CAR */
 .weak  car_uninit
        movl    $car_uninit, %eax
        cmpl    $0, %eax

common/board_f.c +2 -0

index 3d1f305..ec9d2a8 100644
@@ -711,6 +711,7 @@ static int jump_to_copy(void)
         * with the stack in SDRAM and Global Data in temporary memory
         * (CPU cache)
         */
+       arch_setup_gdt(gd->new_gd);
        board_init_f_r_trampoline(gd->start_addr_sp);
 #else
        relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr);

@@ -1028,6 +1029,7 @@ __weak void arch_setup_gdt(struct global_data *gd_ptr)
 {
        gd = gd_ptr;
 }
+#endif /* !CONFIG_X86 */
 
 ulong board_init_f_mem(ulong top, ulong reserve_size)
 {

--

Hi Simon,

Quoted 77 lines · Simon Glass

There is quite a bit of assembler code that can be removed if we use the generic global_data setup. Less arch-specific code makes it easier to add new features and maintain the start-up code.

Drop the unneeded code and adjust the hooks in board_f.c to cope.

Signed-off-by Simon Glass <[email protected]>

---

 arch/x86/cpu/cpu.c   |  4 ++-
 arch/x86/cpu/start.S | 86 ++++++----------------------------------------------
 common/board_f.c     |  3 +-
 3 files changed, 15 insertions(+), 78 deletions(-)

arch/x86/cpu/cpu.c +3 -1

index 4f57145..b2e0323 100644
@@ -136,8 +136,10 @@ static void load_gdt(const u64 *boot_gdt, u16 num_entries)
        asm volatile("lgdtl %0\n" : : "m" (gdt));
 }
 
-void setup_gdt(gd_t *new_gd, u64 *gdt_addr)
+void arch_setup_gdt(gd_t *new_gd)
 {
+       u64 *gdt_addr;
+
        gdt_addr = new_gd->arch.gdt;
 
        /* CS: code, read/execute, 4 GB, base 0 */

arch/x86/cpu/start.S +6 -15

index ac711ed..d93bdfc 100644
@@ -104,8 +104,7 @@ car_init_ret:
         *
         * top-> CONFIG_SYS_CAR_ADDR + CONFIG_SYS_CAR_SIZE
         *      MRC area
-        *      global_data
-        *      x86 global descriptor table
+        *      global_data with x86 global descriptor table
         *      early malloc area
         *      stack
         * bottom-> CONFIG_SYS_CAR_ADDR

@@ -120,13 +119,10 @@ car_init_ret:
         * and esi holds the HOB list address returned by the FSP.
         */
 #endif
-
-       /* Reserve space on stack for global data */
-       subl    $GENERATED_GBL_DATA_SIZE, %esp
-
-       /* Align global data to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-       post_code(POST_START_STACK)
+       /* Set up global data */
+       mov     %esp, %eax
+       call    board_init_f_mem
+       mov     %eax, %esp
 
        /*
         * Debug UART is available here although it may not be plumbed out

@@ -137,19 +133,12 @@ car_init_ret:
         * call  printch
         */
 
-       /* Zero the global data since it won't happen later */
-       xorl    %eax, %eax
-       movl    $GENERATED_GBL_DATA_SIZE, %ecx
-       movl    %esp, %edi
-       rep     stosb
-
 #ifdef CONFIG_HAVE_FSP
+       /* Store the HOB list if we have one */
        test    %esi, %esi
        jz      skip_hob
 

arch/x86/cpu/start.S car_init_ret: · line 141

Quoted 4 lines

arch/x86/cpu/start.S +1 -3

-       /* Store HOB list */
-       movl    %esp, %edx
-       addl    $GD_HOB_LIST, %edx
+fs     addl    $GD_HOB_LIST, %edx

I don't see %edx is initialized anywhere?

Quoted 21 lines

arch/x86/cpu/start.S +0 -13

        movl    %esi, (%edx)
 
 skip_hob:

@@ -159,35 +148,10 @@ skip_hob:
        addl    $GD_TABLE, %edx
        movl    %esi, (%edx)
 #endif
-
-       /* Setup first parameter to setup_gdt, pointer to global_data */
-       movl    %esp, %eax
-
-       /* Reserve space for global descriptor table */
-       subl    $X86_GDT_SIZE, %esp
-
-       /* Align temporary global descriptor table to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-       movl    %esp, %ecx
-
-#if defined(CONFIG_SYS_MALLOC_F_LEN)
-       /* Set up the pre-relocation malloc pool */

arch/x86/cpu/start.S skip_hob: · line 152

Quoted 10 lines

arch/x86/cpu/start.S +2 -8

-       subl    $CONFIG_SYS_MALLOC_F_LEN, %esp
-       movl    %eax, %edx
-       addl    $GD_MALLOC_BASE, %edx
-       movl    %esp, (%edx)
-#endif
-       /* Store BIST into global_data */
-       movl    %eax, %edx
-       addl    $GD_BIST, %edx
+       /* Store BIST */
+fs     addl    $GD_BIST, %edx

Ditto.

Quoted 72 lines

arch/x86/cpu/start.S +1 -37

        movl    %ebp, (%edx)
 
-       /* Set second parameter to setup_gdt() */
-       movl    %ecx, %edx
-
-       /* Setup global descriptor table so gd->xyz works */
-       call    setup_gdt
-
        /* Set parameter to board_init_f() to boot flags */
        post_code(POST_START_DONE)
        xorl    %eax, %eax

@@ -213,37 +177,7 @@ board_init_f_r_trampoline:
        /* Stack grows down from top of SDRAM */
        movl    %eax, %esp
 
-       /* Reserve space on stack for global data */
-       subl    $GENERATED_GBL_DATA_SIZE, %esp
-
-       /* Align global data to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-
-       /* Setup first parameter to memcpy() and setup_gdt() */
-       movl    %esp, %eax
-
-       /* Setup second parameter to memcpy() */
-       fs movl 0, %edx
-
-       /* Set third parameter to memcpy() */
-       movl    $GENERATED_GBL_DATA_SIZE, %ecx
-
-       /* Copy global data from CAR to SDRAM stack */
-       call    memcpy
-
-       /* Reserve space for global descriptor table */
-       subl    $X86_GDT_SIZE, %esp
-
-       /* Align global descriptor table to 16-byte boundary */
-       andl    $0xfffffff0, %esp
-
-       /* Set second parameter to setup_gdt() */
-       movl    %esp, %edx
-
-       /* Setup global descriptor table so gd->xyz works */
-       call    setup_gdt
-
-       /* Set if we need to disable CAR */
+       /* See if we need to disable CAR */
 .weak  car_uninit
        movl    $car_uninit, %eax
        cmpl    $0, %eax

common/board_f.c +2 -0

index 3d1f305..ec9d2a8 100644
@@ -711,6 +711,7 @@ static int jump_to_copy(void)
         * with the stack in SDRAM and Global Data in temporary memory
         * (CPU cache)
         */
+       arch_setup_gdt(gd->new_gd);
        board_init_f_r_trampoline(gd->start_addr_sp);
 #else
        relocate_code(gd->start_addr_sp, gd->new_gd, gd->relocaddr);

@@ -1028,6 +1029,7 @@ __weak void arch_setup_gdt(struct global_data *gd_ptr)
 {
        gd = gd_ptr;
 }
+#endif /* !CONFIG_X86 */
 
 ulong board_init_f_mem(ulong top, ulong reserve_size)
 {

@@ -1049,4 +1051,3 @@ ulong board_init_f_mem(ulong top, ulong reserve_size)
 

common/board_f.c ulong board_init_f_mem(ulong top, ulong reserve_size) · line 1052

Quoted 3 lines

common/board_f.c +0 -1

        return top;
 }
-#endif /* !CONFIG_X86 */

Can we remove the CONFIG_X86 around arch_set_gdt() given it is a __weak and any arch can implement their own?