Skip to content

Commit 799966f

Browse files
committed
[build] Centralise dummy architecture-specific headers
Simplify the process of adding a new CPU architecture by providing common implementations of typically empty architecture-specific header files. Signed-off-by: Michael Brown <[email protected]>
1 parent 7f75d32 commit 799966f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+238
-336
lines changed

src/Makefile.housekeeping

-5
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,6 @@ MAKEDEPS += arch/$(ARCH)/Makefile
366366
include arch/$(ARCH)/Makefile
367367
endif
368368

369-
# Include architecture-specific include path
370-
ifdef ARCH
371-
INCDIRS += arch/$(ARCH)/include
372-
endif
373-
374369
###############################################################################
375370
#
376371
# Especially ugly workarounds

src/arch/arm/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
ASM_TCHAR := %
44
ASM_TCHAR_OPS := %%
55

6-
# Include common ARM headers
6+
# Include ARM-specific headers
77
#
8-
INCDIRS += arch/arm/include
8+
INCDIRS := arch/$(ARCH)/include arch/arm/include $(INCDIRS)
99

1010
# ARM-specific directories containing source files
1111
#

src/arch/arm/include/bits/acpi.h

-12
This file was deleted.

src/arch/arm/include/bits/hyperv.h

-12
This file was deleted.

src/arch/arm/include/bits/iomap.h

-12
This file was deleted.

src/arch/arm/include/bits/mp.h

-12
This file was deleted.

src/arch/arm/include/bits/pci_io.h

-12
This file was deleted.

src/arch/arm/include/bits/reboot.h

-12
This file was deleted.

src/arch/arm/include/bits/sanboot.h

-12
This file was deleted.

src/arch/arm/include/bits/smbios.h

-12
This file was deleted.

src/arch/arm/include/bits/time.h

-12
This file was deleted.

src/arch/arm/include/bits/uaccess.h

-12
This file was deleted.

src/arch/arm/include/bits/uart.h

-12
This file was deleted.

src/arch/arm/include/bits/umalloc.h

-12
This file was deleted.

src/arch/arm32/include/bits/tcpip.h

-19
This file was deleted.

src/arch/loong64/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ endif
1818
# EFI requires -fshort-wchar, and nothing else currently uses wchar_t
1919
CFLAGS += -fshort-wchar
2020

21+
# Include LoongArch64-specific headers
22+
INCDIRS := arch/$(ARCH)/include $(INCDIRS)
23+
2124
# LoongArch64-specific directories containing source files
2225
SRCDIRS += arch/loong64/core
2326
SRCDIRS += arch/loong64/interface/efi

src/arch/loong64/include/bits/acpi.h

-12
This file was deleted.

src/arch/loong64/include/bits/hyperv.h

-12
This file was deleted.

src/arch/loong64/include/bits/iomap.h

-12
This file was deleted.

src/arch/loong64/include/bits/mp.h

-12
This file was deleted.

src/arch/loong64/include/bits/pci_io.h

-12
This file was deleted.

src/arch/loong64/include/bits/reboot.h

-12
This file was deleted.

src/arch/loong64/include/bits/sanboot.h

-12
This file was deleted.

src/arch/loong64/include/bits/smbios.h

-12
This file was deleted.

src/arch/loong64/include/bits/tcpip.h

-19
This file was deleted.

src/arch/loong64/include/bits/time.h

-12
This file was deleted.

src/arch/loong64/include/bits/uaccess.h

-12
This file was deleted.

src/arch/loong64/include/bits/uart.h

-12
This file was deleted.

src/arch/loong64/include/bits/umalloc.h

-12
This file was deleted.

src/arch/x86/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
ASM_TCHAR := @
44
ASM_TCHAR_OPS := @
55

6-
# Include common x86 headers
6+
# Include x86-specific headers
77
#
8-
INCDIRS += arch/x86/include
8+
INCDIRS := arch/$(ARCH)/include arch/x86/include $(INCDIRS)
99

1010
# x86-specific directories containing source files
1111
#

0 commit comments

Comments
 (0)