OFFSET support

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index ab65cd3..970dd9a 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -92,6 +92,14 @@ source "kernel/Kconfig.freezer"
 
 source "arch/h8300/Kconfig.cpu"
 
+menu "Kernel Features"
+
+source "kernel/Kconfig.preempt"
+
+source "mm/Kconfig"
+
+endmenu
+
 menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"
@@ -102,8 +110,6 @@ source "net/Kconfig"
 
 source "drivers/Kconfig"
 
-source "arch/h8300/Kconfig.ide"
-
 source "fs/Kconfig"
 
 source "arch/h8300/Kconfig.debug"

diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index 1e0e8db..741d785 100644 (file)
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -125,8 +125,9 @@ config RAMSIZE
        default 0x400000 if H8300_KANEBEBE
        default 0x800000 if H8S_EDOSK2674 || H8S_SIM
 
-source "kernel/Kconfig.preempt"
-
-source "mm/Kconfig"
+config OFFSET
+        hex "Load offset"
+       depends on RAMKERNEL
+       default 0
 
 endmenu

diff --git a/arch/h8300/boot/Makefile b/arch/h8300/boot/Makefile
index cd3767c..5072b36 100644 (file)
--- a/arch/h8300/boot/Makefile
+++ b/arch/h8300/boot/Makefile
@@ -9,7 +9,7 @@ OBJCOPYFLAGS_zImage := -O binary -R .note -R .comment -R .stab -R .stabstr -S
 
 UIMAGE_LOADADDR = $(CONFIG_RAMBASE)
 UIMAGE_ENTRYADDR = $(shell /bin/bash -c 'printf "0x%08x" \
-       $$[$(CONFIG_RAMBASE) + 0x40]')
+       $$[$(CONFIG_RAMBASE) + $(CONFIG_OFFSET)]')
 
 $(obj)/vmlinux.srec $(obj)/vmlinux.bin:  vmlinux FORCE
        $(call if_changed,objcopy)

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index adf83dd..2719d5c 100644 (file)
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -20,7 +20,7 @@ SECTIONS
 #else
        . = RAMTOP;
        _ramstart = .;
-       . = . + 0x40;
+       . = . + CONFIG_OFFSET;
 #endif
        _text = .;
        HEAD_TEXT_SECTION