Changes in / [9b642f92:f9c4bc5] in mainline

Location:

boot

Files:

• Makefile.build (modified) (4 diffs)
• Makefile.common (modified) (1 diff)
• arch/arm32/include/arch.h (added)
• arch/arm32/include/arch/arch.h (deleted)
• arch/arm32/include/arch/asm.h (deleted)
• arch/arm32/include/arch/cp15.h (deleted)
• arch/arm32/include/arch/main.h (deleted)
• arch/arm32/include/arch/mm.h (deleted)
• arch/arm32/include/arch/types.h (deleted)
• arch/arm32/include/asm.h (added)
• arch/arm32/include/cp15.h (added)
• arch/arm32/include/main.h (added)
• arch/arm32/include/mm.h (added)
• arch/arm32/include/types.h (added)
• arch/ia64/include/arch.h (added)
• arch/ia64/include/arch/arch.h (deleted)
• arch/ia64/include/arch/asm.h (deleted)
• arch/ia64/include/arch/main.h (deleted)
• arch/ia64/include/arch/pal.h (deleted)
• arch/ia64/include/arch/sal.h (deleted)
• arch/ia64/include/arch/ski.h (deleted)
• arch/ia64/include/arch/types.h (deleted)
• arch/ia64/include/asm.h (added)
• arch/ia64/include/main.h (added)
• arch/ia64/include/pal.h (added)
• arch/ia64/include/sal.h (added)
• arch/ia64/include/ski.h (added)
• arch/ia64/include/types.h (added)
• arch/mips32/include/arch.h (added)
• arch/mips32/include/arch/arch.h (deleted)
• arch/mips32/include/arch/asm.h (deleted)
• arch/mips32/include/arch/main.h (deleted)
• arch/mips32/include/arch/regname.h (deleted)
• arch/mips32/include/arch/types.h (deleted)
• arch/mips32/include/asm.h (added)
• arch/mips32/include/main.h (added)
• arch/mips32/include/regname.h (added)
• arch/mips32/include/types.h (added)
• arch/ppc32/include/arch.h (added)
• arch/ppc32/include/arch/arch.h (deleted)
• arch/ppc32/include/arch/asm.h (deleted)
• arch/ppc32/include/arch/main.h (deleted)
• arch/ppc32/include/arch/ofw.h (deleted)
• arch/ppc32/include/arch/regname.h (deleted)
• arch/ppc32/include/arch/types.h (deleted)
• arch/ppc32/include/asm.h (added)
• arch/ppc32/include/main.h (added)
• arch/ppc32/include/ofw.h (added)
• arch/ppc32/include/regname.h (added)
• arch/ppc32/include/types.h (added)
• arch/riscv64/include/arch.h (added)
• arch/riscv64/include/arch/arch.h (deleted)
• arch/riscv64/include/arch/asm.h (deleted)
• arch/riscv64/include/arch/main.h (deleted)
• arch/riscv64/include/arch/mm.h (deleted)
• arch/riscv64/include/arch/types.h (deleted)
• arch/riscv64/include/arch/ucb.h (deleted)
• arch/riscv64/include/asm.h (added)
• arch/riscv64/include/main.h (added)
• arch/riscv64/include/mm.h (added)
• arch/riscv64/include/types.h (added)
• arch/riscv64/include/ucb.h (added)
• arch/sparc64/include/arch.h (added)
• arch/sparc64/include/arch/arch.h (deleted)
• arch/sparc64/include/arch/asm.h (deleted)
• arch/sparc64/include/arch/main.h (deleted)
• arch/sparc64/include/arch/ofw.h (deleted)
• arch/sparc64/include/arch/types.h (deleted)
• arch/sparc64/include/asm.h (added)
• arch/sparc64/include/main.h (added)
• arch/sparc64/include/ofw.h (added)
• arch/sparc64/include/types.h (added)
• genarch/include/division.h (added)
• genarch/include/efi.h (added)
• genarch/include/genarch/division.h (deleted)
• genarch/include/genarch/efi.h (deleted)
• genarch/include/genarch/multiplication.h (deleted)
• genarch/include/genarch/ofw.h (deleted)
• genarch/include/genarch/ofw_tree.h (deleted)
• genarch/include/multiplication.h (added)
• genarch/include/ofw.h (added)
• genarch/include/ofw_tree.h (added)

boot/Makefile.build

@@ -31 +31 @@
 include Makefile.common
 
-INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include
+INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
 OPTIMIZATION = 3
 
@@ -77 +77 @@
 
 clean:
-        rm -f $(RAW) $(MAP)
+        rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
 
 -include $(DEPENDS)
@@ -110 +110 @@
 endif
 
-depend: $(PRE_DEPEND)
+depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(PRE_DEPEND)
 
 $(COMPS).s: $(COMPS).zip
@@ -129 +129 @@
 include Makefile.initrd
 
+$(ARCH_INCLUDE) $(ARCH_INCLUDE)/%.h: arch/$(KARCH)/include/
+        ln -sfn ../../$< $@
+
+$(GENARCH_INCLUDE) $(GENARCH_INCLUDE)/%.h: genarch/include/
+        ln -sfn ../../$< $@

boot/Makefile.common

@@ -58 +58 @@
 
 JOBFILE = $(ROOT_PATH)/tools/jobfile.py
+
+ARCH_INCLUDE = generic/include/arch
+GENARCH_INCLUDE = generic/include/genarch
 
 DISTROOT = distroot