Skip to content

Commit

Permalink
x86_64: rename the nuttx binary with the multiboot1 loader to nuttx.mb1
Browse files Browse the repository at this point in the history
Signed-off-by: Shanmin Zhang <[email protected]>
  • Loading branch information
zhangshanmin authored and xiaoxiang781216 committed Jan 21, 2025
1 parent 473bffa commit a131bc3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
/defconfig
/Make.defs
/nuttx
/nuttx32
/nuttx-*
/nuttx.*
/nuttx_user*
Expand Down
2 changes: 1 addition & 1 deletion arch/x86_64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ config ARCH_MULTIBOOT1
bool "Enable ELF32/Multiboot1"
default n
---help---
This enables generating `nuttx32` and allows x86 QEMU
This enables generating `nuttx.mb1` and allows x86 QEMU
`-kernel` boot in multiboot1 protocol.

config ARCH_MULTIBOOT2
Expand Down
4 changes: 2 additions & 2 deletions arch/x86_64/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ ifneq ($(CONFIG_WINDOWS_NATIVE),y)
endif

ifeq ($(CONFIG_ARCH_MULTIBOOT1),y)
@echo "Generating: nuttx32 in ELF32/multiboot1"
@echo "Generating: nuttx.mb1 in ELF32/multiboot1"
$(Q) $(OBJCOPY) -R.realmode -R.note.* -O binary $(NUTTX) $(NUTTX).bin \
&& $(OBJCOPY) -j.realmode -O binary $(NUTTX) $(NUTTX)_realmode.bin \
&& $(CC) -m32 -no-pie -nostdlib common/multiboot1.S \
-T common/multiboot1.ld -o $(NUTTX)32
-T common/multiboot1.ld -o $(NUTTX).mb1
endif

# This is part of the top-level export target
Expand Down

0 comments on commit a131bc3

Please sign in to comment.