t-kernel team mailing list archive
-
t-kernel team
-
Mailing list archive
-
Message #00029
[PATCH] kbuild: rename to vmtronx, delete unsed files
From: Du Huanpeng <u74147@xxxxxxxxx>
Signed-off-by: Du Huanpeng <u74147@xxxxxxxxx>
---
tkernel_source/.gitignore | 2 +-
tkernel_source/Documentation/DocBook/Makefile | 0
tkernel_source/Documentation/Makefile | 0
tkernel_source/Kconfig | 22 +-
tkernel_source/Makefile | 85 +++----
tkernel_source/arch/arm/Kconfig | 17 --
tkernel_source/arch/arm/Makefile | 0
tkernel_source/arch/arm/kernel/vmlinux.lds | 0
tkernel_source/arch/mips/Kconfig | 0
tkernel_source/arch/mips/Makefile | 0
tkernel_source/arch/mips/kernel/vmlinux.lds | 0
tkernel_source/block/Makefile | 1 -
tkernel_source/block/block.c | 0
tkernel_source/certs/Makefile | 1 -
tkernel_source/certs/certs.c | 0
tkernel_source/config/Kconfig | 0
tkernel_source/crypto/Makefile | 1 -
tkernel_source/crypto/crypto.c | 0
tkernel_source/drivers/Makefile | 1 -
tkernel_source/drivers/drivers.c | 0
tkernel_source/firmware/Makefile | 1 -
tkernel_source/firmware/firmware.c | 0
tkernel_source/fs/Makefile | 1 -
tkernel_source/fs/fs.c | 0
tkernel_source/init/Makefile | 2 -
tkernel_source/init/init.c | 0
tkernel_source/ipc/Makefile | 1 -
tkernel_source/ipc/ipc.c | 0
tkernel_source/mm/Makefile | 1 -
tkernel_source/mm/mm.c | 0
tkernel_source/monitor/Kconfig | 0
tkernel_source/net/Makefile | 1 -
tkernel_source/net/net.c | 0
tkernel_source/scripts/Makefile | 2 +-
tkernel_source/scripts/Makefile.lib | 2 +-
tkernel_source/scripts/Makefile.modpost | 6 +-
tkernel_source/scripts/checkpatch.pl | 8 +-
tkernel_source/scripts/checkstack.pl | 2 +-
tkernel_source/scripts/decode_stacktrace.sh | 10 +-
tkernel_source/scripts/extract-sys-certs.pl | 30 +--
tkernel_source/scripts/extract-vmlinux | 62 -----
tkernel_source/scripts/extract-vmtronx | 62 +++++
tkernel_source/scripts/gdb/linux/symbols.py | 8 +-
tkernel_source/scripts/gdb/vmlinux-gdb.py | 31 ---
tkernel_source/scripts/gdb/vmtronx-gdb.py | 31 +++
tkernel_source/scripts/kallsyms.c | 2 +-
.../scripts/kconfig/streamline_config.pl | 4 +-
tkernel_source/scripts/link-vmlinux.sh | 252 ---------------------
tkernel_source/scripts/link-vmtronx.sh | 252 +++++++++++++++++++++
tkernel_source/scripts/markup_oops.pl | 12 +-
tkernel_source/scripts/mksysmap | 4 +-
tkernel_source/scripts/mod/modpost.c | 54 ++---
tkernel_source/scripts/namespace.pl | 4 +-
tkernel_source/scripts/package/builddeb | 10 +-
tkernel_source/scripts/package/buildtar | 50 ++--
tkernel_source/scripts/package/mkspec | 26 +--
tkernel_source/scripts/recordmcount.pl | 2 +-
tkernel_source/scripts/sortextable.c | 4 +-
tkernel_source/security/Makefile | 1 -
tkernel_source/security/security.c | 0
tkernel_source/sound/Makefile | 1 -
tkernel_source/sound/sound.c | 0
tkernel_source/usr/Makefile | 1 -
tkernel_source/usr/usr.c | 0
tkernel_source/virt/Makefile | 1 -
tkernel_source/virt/virt.c | 0
66 files changed, 529 insertions(+), 542 deletions(-)
delete mode 100644 tkernel_source/Documentation/DocBook/Makefile
delete mode 100644 tkernel_source/Documentation/Makefile
delete mode 100644 tkernel_source/arch/arm/Kconfig
delete mode 100644 tkernel_source/arch/arm/Makefile
delete mode 100644 tkernel_source/arch/arm/kernel/vmlinux.lds
delete mode 100644 tkernel_source/arch/mips/Kconfig
delete mode 100644 tkernel_source/arch/mips/Makefile
delete mode 100644 tkernel_source/arch/mips/kernel/vmlinux.lds
delete mode 100644 tkernel_source/block/Makefile
delete mode 100644 tkernel_source/block/block.c
delete mode 100644 tkernel_source/certs/Makefile
delete mode 100644 tkernel_source/certs/certs.c
create mode 100644 tkernel_source/config/Kconfig
delete mode 100644 tkernel_source/crypto/Makefile
delete mode 100644 tkernel_source/crypto/crypto.c
delete mode 100644 tkernel_source/drivers/Makefile
delete mode 100644 tkernel_source/drivers/drivers.c
delete mode 100644 tkernel_source/firmware/Makefile
delete mode 100644 tkernel_source/firmware/firmware.c
delete mode 100644 tkernel_source/fs/Makefile
delete mode 100644 tkernel_source/fs/fs.c
delete mode 100644 tkernel_source/init/Makefile
delete mode 100644 tkernel_source/init/init.c
delete mode 100644 tkernel_source/ipc/Makefile
delete mode 100644 tkernel_source/ipc/ipc.c
delete mode 100644 tkernel_source/mm/Makefile
delete mode 100644 tkernel_source/mm/mm.c
create mode 100644 tkernel_source/monitor/Kconfig
delete mode 100644 tkernel_source/net/Makefile
delete mode 100644 tkernel_source/net/net.c
delete mode 100755 tkernel_source/scripts/extract-vmlinux
create mode 100755 tkernel_source/scripts/extract-vmtronx
delete mode 100644 tkernel_source/scripts/gdb/vmlinux-gdb.py
create mode 100644 tkernel_source/scripts/gdb/vmtronx-gdb.py
delete mode 100755 tkernel_source/scripts/link-vmlinux.sh
create mode 100755 tkernel_source/scripts/link-vmtronx.sh
delete mode 100644 tkernel_source/security/Makefile
delete mode 100644 tkernel_source/security/security.c
delete mode 100644 tkernel_source/sound/Makefile
delete mode 100644 tkernel_source/sound/sound.c
delete mode 100644 tkernel_source/usr/Makefile
delete mode 100644 tkernel_source/usr/usr.c
delete mode 100644 tkernel_source/virt/Makefile
delete mode 100644 tkernel_source/virt/virt.c
diff --git a/tkernel_source/.gitignore b/tkernel_source/.gitignore
index ba92191..eff1dc6 100644
--- a/tkernel_source/.gitignore
+++ b/tkernel_source/.gitignore
@@ -119,4 +119,4 @@ Dependencies_src
*.map
*.sys
*.mot
-
+/vmtronx
diff --git a/tkernel_source/Documentation/DocBook/Makefile b/tkernel_source/Documentation/DocBook/Makefile
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/Documentation/Makefile b/tkernel_source/Documentation/Makefile
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/Kconfig b/tkernel_source/Kconfig
index c13f48d..b258c96 100644
--- a/tkernel_source/Kconfig
+++ b/tkernel_source/Kconfig
@@ -2,10 +2,28 @@
# For a description of the syntax of this configuration file,
# see Documentation/kbuild/kconfig-language.txt.
#
-mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"
+mainmenu "T-Kernel(Linux-4.4.1)/$ARCH $KERNELVERSION Kernel Configuration"
config SRCARCH
string
option env="SRCARCH"
-source "arch/$SRCARCH/Kconfig"
+config TKERNEL
+ bool "T-Kernel"
+
+config TMONITOR
+ bool "T-Monitor"
+
+config ROMINFO
+ bool "ROM Info"
+
+config KBUILD_VERSION
+ string "KBuild Version"
+ default "linux-4.4.1"
+
+config VMTRONX
+ string "T-Kernel image name"
+ default "vmtronx"
+
+source "config/Kconfig"
+source "monitor/Kconfig"
diff --git a/tkernel_source/Makefile b/tkernel_source/Makefile
index 9218bb7..9a00d53 100644
--- a/tkernel_source/Makefile
+++ b/tkernel_source/Makefile
@@ -31,7 +31,7 @@ unexport GREP_OPTIONS
# their own directory. If in some directory we have a dependency on
# a file in another dir (which doesn't happen often, but it's often
# unavoidable when linking the built-in.o targets which finally
-# turn into vmlinux), we will call a sub make in that other dir, and
+# turn into vmtronx), we will call a sub make in that other dir, and
# after that we are sure that everything which is in that other dir
# is now up to date.
#
@@ -546,7 +546,7 @@ config: scripts_basic outputmakefile FORCE
else
# ===========================================================================
-# Build targets only - this includes vmlinux, arch specific targets, clean
+# Build targets only - this includes vmtronx, arch specific targets, clean
# targets and others. In general all targets except *config targets.
ifeq ($(KBUILD_EXTMOD),)
@@ -559,10 +559,10 @@ __scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
asm-generic
$(Q)$(MAKE) $(build)=$(@)
-# Objects we will link into vmlinux / subdirs we need to visit
-init-y := init/
-drivers-y := drivers/ sound/ firmware/ driver/
-net-y := net/
+# Objects we will link into vmtronx / subdirs we need to visit
+init-y :=
+drivers-y := driver/
+net-y :=
libs-y := lib/
libs-y += lib/crt/crt0/src/sysdepend/tef_em1d/
libs-y += lib/crt/crttk/src/
@@ -574,8 +574,8 @@ libs-y += lib/libsys/src/
libs-y += lib/libtk/src/
libs-y += lib/libtk/src/sysdepend/tef_em1d/
libs-y += lib/libtm/src/
-core-y := usr/
-virt-y := virt/
+core-y :=
+virt-y :=
endif # KBUILD_EXTMOD
ifeq ($(dot-config),1)
@@ -620,15 +620,16 @@ endif # $(dot-config)
# The all: target is the default when no target is given on the
# command line.
# This allow a user to issue only 'make' to build a kernel including modules
-# Defaults to vmlinux, but the arch makefile usually adds further targets
-all: vmlinux
+# Defaults to vmtronx, but the arch makefile usually adds further targets
+all: vmtronx
# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
# values of the respective KBUILD_* variables
ARCH_CPPFLAGS :=
ARCH_AFLAGS :=
ARCH_CFLAGS :=
-include arch/$(SRCARCH)/Makefile
+include monitor/Makefile
+include config/Makefile
KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
@@ -814,10 +815,10 @@ KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)
LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
$(call cc-ldoption, -Wl$(comma)--build-id,))
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
-LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
+LDFLAGS_vmtronx += $(LDFLAGS_BUILD_ID)
ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
-LDFLAGS_vmlinux += $(call ld-option, -X,)
+LDFLAGS_vmtronx += $(call ld-option, -X,)
endif
# Default kernel image to build when no specific target is given.
@@ -825,7 +826,7 @@ endif
# set in the environment
# Also any assignments in arch/$(ARCH)/Makefile take precedence over
# this default value
-export KBUILD_IMAGE ?= vmlinux
+export KBUILD_IMAGE ?= vmtronx
#
# INSTALL_PATH specifies where to place the updated kernel and system map
@@ -904,13 +905,13 @@ export mod_sign_cmd
ifeq ($(KBUILD_EXTMOD),)
-core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
+core-y += kernel/
-vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+vmtronx-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
$(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))
-vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
+vmtronx-alldirs := $(sort $(vmtronx-dirs) $(patsubst %/,%,$(filter %/, \
$(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-))))
init-y := $(patsubst %/, %/built-in.o, $(init-y))
@@ -922,23 +923,23 @@ libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y))
libs-y := $(libs-y1) $(libs-y2)
virt-y := $(patsubst %/, %/built-in.o, $(virt-y))
-# Externally visible symbols (used by link-vmlinux.sh)
+# Externally visible symbols (used by link-vmtronx.sh)
export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y)
export KBUILD_LDS := kernel/sysmain/build/tef_em1d/kernel-ram.lnk
-export LDFLAGS_vmlinux
+export LDFLAGS_vmtronx
# used by scripts/pacmage/Makefile
-export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)
+export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmtronx-alldirs)) arch Documentation include samples scripts tools)
-vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
+vmtronx-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
-# Final link of vmlinux
- cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
-quiet_cmd_link-vmlinux = LINK $@
+# Final link of vmtronx
+ cmd_link-vmtronx = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmtronx)
+quiet_cmd_link-vmtronx = LINK $@
# Include targets which we want to
# execute if the rest of the kernel build went well.
-vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
+vmtronx: scripts/link-vmtronx.sh $(vmtronx-deps) FORCE
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
@@ -949,22 +950,22 @@ ifdef CONFIG_BUILD_DOCSRC
$(Q)$(MAKE) $(build)=Documentation
endif
ifdef CONFIG_GDB_SCRIPTS
- $(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
+ $(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmtronx-gdb.py
endif
- +$(call if_changed,link-vmlinux)
+ +$(call if_changed,link-vmtronx)
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
-$(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
+$(sort $(vmtronx-deps)): $(vmtronx-dirs) ;
-# Handle descending into subdirectories listed in $(vmlinux-dirs)
+# Handle descending into subdirectories listed in $(vmtronx-dirs)
# Preset locale variables to speed up the build process. Limit locale
# tweaks to this spot to avoid wrong language settings when running
# make menuconfig etc.
# Error messages still appears in the original language
-PHONY += $(vmlinux-dirs)
-$(vmlinux-dirs): prepare scripts
+PHONY += $(vmtronx-dirs)
+$(vmtronx-dirs): prepare scripts
$(Q)$(MAKE) $(build)=$@
define filechk_kernel.release
@@ -1122,13 +1123,13 @@ all: modules
# using awk while concatenating to the final file.
PHONY += modules
-modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
- $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+modules: $(vmtronx-dirs) $(if $(KBUILD_BUILTIN),vmtronx) modules.builtin
+ $(Q)$(AWK) '!x[$$0]++' $(vmtronx-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
@$(kecho) ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild
-modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+modules.builtin: $(vmtronx-dirs:%=%/modules.builtin)
$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin
%/modules.builtin: include/config/auto.conf
@@ -1203,22 +1204,22 @@ MRPROPER_FILES += .config .config.old .version .old_version \
Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
signing_key.pem signing_key.priv signing_key.x509 \
x509.genkey extra_certificates signing_key.x509.keyid \
- signing_key.x509.signer vmlinux-gdb.py
+ signing_key.x509.signer vmtronx-gdb.py
# clean - Delete most, but leave enough to build external modules
#
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
-clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples)
+clean-dirs := $(addprefix _clean_, . $(vmtronx-alldirs) samples)
-PHONY += $(clean-dirs) clean archclean vmlinuxclean
+PHONY += $(clean-dirs) clean archclean vmtronxclean
$(clean-dirs):
$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
-vmlinuxclean:
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
+vmtronxclean:
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmtronx.sh clean
-clean: archclean vmlinuxclean
+clean: archclean vmtronxclean
# mrproper - Delete all generated files, including .config
#
@@ -1279,7 +1280,7 @@ help:
@echo ''
@echo 'Other generic targets:'
@echo ' all - Build all targets marked with [*]'
- @echo '* vmlinux - Build the bare kernel'
+ @echo '* vmtronx - Build the bare kernel'
@echo '* modules - Build all modules'
@echo ' modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'
@echo ' firmware_install- Install all firmware to INSTALL_FW_PATH'
@@ -1510,7 +1511,7 @@ else
CHECKSTACK_ARCH := $(ARCH)
endif
checkstack:
- $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
+ $(OBJDUMP) -d vmtronx $$(find . -name '*.ko') | \
$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
kernelrelease:
diff --git a/tkernel_source/arch/arm/Kconfig b/tkernel_source/arch/arm/Kconfig
deleted file mode 100644
index d72bd4e..0000000
--- a/tkernel_source/arch/arm/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-config TKERNEL
- bool "T-Kernel"
-
-config TMONITOR
- bool "T-Monitor"
-
-config ROMINFO
- bool "ROM Info"
-
-config KBUILD_VERSION
- string "KBuild Version"
- default "linux-4.4.1"
-
-config VMTRONX
- string "T-Kernel image name"
- default "vmtronx"
-
diff --git a/tkernel_source/arch/arm/Makefile b/tkernel_source/arch/arm/Makefile
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/arch/arm/kernel/vmlinux.lds b/tkernel_source/arch/arm/kernel/vmlinux.lds
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/arch/mips/Kconfig b/tkernel_source/arch/mips/Kconfig
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/arch/mips/Makefile b/tkernel_source/arch/mips/Makefile
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/arch/mips/kernel/vmlinux.lds b/tkernel_source/arch/mips/kernel/vmlinux.lds
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/block/Makefile b/tkernel_source/block/Makefile
deleted file mode 100644
index ff16485..0000000
--- a/tkernel_source/block/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += block.o
diff --git a/tkernel_source/block/block.c b/tkernel_source/block/block.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/certs/Makefile b/tkernel_source/certs/Makefile
deleted file mode 100644
index a64fd69..0000000
--- a/tkernel_source/certs/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += certs.o
diff --git a/tkernel_source/certs/certs.c b/tkernel_source/certs/certs.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/config/Kconfig b/tkernel_source/config/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/tkernel_source/crypto/Makefile b/tkernel_source/crypto/Makefile
deleted file mode 100644
index 5ea6012..0000000
--- a/tkernel_source/crypto/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += crypto.o
diff --git a/tkernel_source/crypto/crypto.c b/tkernel_source/crypto/crypto.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/drivers/Makefile b/tkernel_source/drivers/Makefile
deleted file mode 100644
index 6d52131..0000000
--- a/tkernel_source/drivers/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += drivers.o
diff --git a/tkernel_source/drivers/drivers.c b/tkernel_source/drivers/drivers.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/firmware/Makefile b/tkernel_source/firmware/Makefile
deleted file mode 100644
index 0708e77..0000000
--- a/tkernel_source/firmware/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += firmware.o
diff --git a/tkernel_source/firmware/firmware.c b/tkernel_source/firmware/firmware.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/fs/Makefile b/tkernel_source/fs/Makefile
deleted file mode 100644
index 1ddeefa..0000000
--- a/tkernel_source/fs/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += fs.o
diff --git a/tkernel_source/fs/fs.c b/tkernel_source/fs/fs.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/init/Makefile b/tkernel_source/init/Makefile
deleted file mode 100644
index 98daf27..0000000
--- a/tkernel_source/init/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += init.o
-
diff --git a/tkernel_source/init/init.c b/tkernel_source/init/init.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/ipc/Makefile b/tkernel_source/ipc/Makefile
deleted file mode 100644
index 148e353..0000000
--- a/tkernel_source/ipc/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += ipc.o
diff --git a/tkernel_source/ipc/ipc.c b/tkernel_source/ipc/ipc.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/mm/Makefile b/tkernel_source/mm/Makefile
deleted file mode 100644
index b18cec4..0000000
--- a/tkernel_source/mm/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += mm.o
diff --git a/tkernel_source/mm/mm.c b/tkernel_source/mm/mm.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/monitor/Kconfig b/tkernel_source/monitor/Kconfig
new file mode 100644
index 0000000..e69de29
diff --git a/tkernel_source/net/Makefile b/tkernel_source/net/Makefile
deleted file mode 100644
index 2b6617b..0000000
--- a/tkernel_source/net/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += net.o
diff --git a/tkernel_source/net/net.c b/tkernel_source/net/net.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/scripts/Makefile b/tkernel_source/scripts/Makefile
index fd0d53d..be0f33c 100644
--- a/tkernel_source/scripts/Makefile
+++ b/tkernel_source/scripts/Makefile
@@ -2,7 +2,7 @@
# scripts contains sources for various helper programs used throughout
# the kernel for the build process.
# ---------------------------------------------------------------------------
-# kallsyms: Find all symbols in vmlinux
+# kallsyms: Find all symbols in vmtronx
# pnmttologo: Convert pnm files to logo files
# conmakehash: Create chartable
# conmakehash: Create arrays for initializing the kernel console tables
diff --git a/tkernel_source/scripts/Makefile.lib b/tkernel_source/scripts/Makefile.lib
index 79e8661..be0d06d 100644
--- a/tkernel_source/scripts/Makefile.lib
+++ b/tkernel_source/scripts/Makefile.lib
@@ -267,7 +267,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
quiet_cmd_dt_S_dtb= DTB $@
cmd_dt_S_dtb= \
( \
- echo '\#include <asm-generic/vmlinux.lds.h>'; \
+ echo '\#include <asm-generic/vmtronx.lds.h>'; \
echo '.section .dtb.init.rodata,"a"'; \
echo '.balign STRUCT_ALIGNMENT'; \
echo '.global __dtb_$(*F)_begin'; \
diff --git a/tkernel_source/scripts/Makefile.modpost b/tkernel_source/scripts/Makefile.modpost
index 1366a94..aef6851 100644
--- a/tkernel_source/scripts/Makefile.modpost
+++ b/tkernel_source/scripts/Makefile.modpost
@@ -83,17 +83,17 @@ modpost = scripts/mod/modpost \
MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
# We can go over command line length here, so be careful.
-quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
+quiet_cmd_modpost = MODPOST $(words $(filter-out vmtronx FORCE, $^)) modules
cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) $(MODPOST_OPT) -s -T -
PHONY += __modpost
__modpost: $(modules:.ko=.o) FORCE
- $(call cmd,modpost) $(wildcard vmlinux)
+ $(call cmd,modpost) $(wildcard vmtronx)
quiet_cmd_kernel-mod = MODPOST $@
cmd_kernel-mod = $(modpost) $@
-vmlinux.o: FORCE
+vmtronx.o: FORCE
$(call cmd,kernel-mod)
# Declare generated files as targets for modpost
diff --git a/tkernel_source/scripts/checkpatch.pl b/tkernel_source/scripts/checkpatch.pl
index 2b3c228..ebaab7f 100755
--- a/tkernel_source/scripts/checkpatch.pl
+++ b/tkernel_source/scripts/checkpatch.pl
@@ -4502,7 +4502,7 @@ sub process {
# multi-statement macros should be enclosed in a do while loop, grab the
# first statement and ensure its the whole macro if its not enclosed
# in a known good container
- if ($realfile !~ m@/vmlinux.lds.h$@ &&
+ if ($realfile !~ m@/vmtronx.lds.h$@ &&
$line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
my $ln = $linenr;
my $cnt = $realcnt;
@@ -4612,7 +4612,7 @@ sub process {
# single-statement macros do not need to be enclosed in do while (0) loop,
# macro should not end with a semicolon
if ($^V && $^V ge 5.10.0 &&
- $realfile !~ m@/vmlinux.lds.h$@ &&
+ $realfile !~ m@/vmtronx.lds.h$@ &&
$line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
my $ln = $linenr;
my $cnt = $realcnt;
@@ -4665,9 +4665,9 @@ sub process {
# .
# ALIGN(...)
# VMLINUX_SYMBOL(...)
- if ($realfile eq 'vmlinux.lds.h' && $line =~ /(?:(?:^|\s)$Ident\s*=|=\s*$Ident(?:\s|$))/) {
+ if ($realfile eq 'vmtronx.lds.h' && $line =~ /(?:(?:^|\s)$Ident\s*=|=\s*$Ident(?:\s|$))/) {
WARN("MISSING_VMLINUX_SYMBOL",
- "vmlinux.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr);
+ "vmtronx.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr);
}
# check for redundant bracing round if etc
diff --git a/tkernel_source/scripts/checkstack.pl b/tkernel_source/scripts/checkstack.pl
index dd83978..84aa4db 100755
--- a/tkernel_source/scripts/checkstack.pl
+++ b/tkernel_source/scripts/checkstack.pl
@@ -17,7 +17,7 @@
# sparc port by Martin Habets <errandir_news@xxxxxxxxxxxxxxxxx>
#
# Usage:
-# objdump -d vmlinux | scripts/checkstack.pl [arch]
+# objdump -d vmtronx | scripts/checkstack.pl [arch]
#
# TODO : Port to all architectures (one regex per arch)
diff --git a/tkernel_source/scripts/decode_stacktrace.sh b/tkernel_source/scripts/decode_stacktrace.sh
index 00d6d53..cf99f6e 100755
--- a/tkernel_source/scripts/decode_stacktrace.sh
+++ b/tkernel_source/scripts/decode_stacktrace.sh
@@ -4,11 +4,11 @@
if [[ $# != 2 ]]; then
echo "Usage:"
- echo " $0 [vmlinux] [base path]"
+ echo " $0 [vmtronx] [base path]"
exit 1
fi
-vmlinux=$1
+vmtronx=$1
basepath=$2
declare -A cache
@@ -26,13 +26,13 @@ parse_symbol() {
# Strip the symbol name so that we could look it up
local name=${symbol%+*}
- # Use 'nm vmlinux' to figure out the base address of said symbol.
+ # Use 'nm vmtronx' to figure out the base address of said symbol.
# It's actually faster to call it every time than to load it
# all into bash.
if [[ "${cache[$name]+isset}" == "isset" ]]; then
local base_addr=${cache[$name]}
else
- local base_addr=$(nm "$vmlinux" | grep -i ' t ' | awk "/ $name\$/ {print \$1}" | head -n1)
+ local base_addr=$(nm "$vmtronx" | grep -i ' t ' | awk "/ $name\$/ {print \$1}" | head -n1)
cache["$name"]="$base_addr"
fi
# Let's start doing the math to get the exact address into the
@@ -52,7 +52,7 @@ parse_symbol() {
if [[ "${cache[$address]+isset}" == "isset" ]]; then
local code=${cache[$address]}
else
- local code=$(addr2line -i -e "$vmlinux" "$address")
+ local code=$(addr2line -i -e "$vmtronx" "$address")
cache[$address]=$code
fi
diff --git a/tkernel_source/scripts/extract-sys-certs.pl b/tkernel_source/scripts/extract-sys-certs.pl
index d476e7d..752294f 100755
--- a/tkernel_source/scripts/extract-sys-certs.pl
+++ b/tkernel_source/scripts/extract-sys-certs.pl
@@ -4,7 +4,7 @@ use strict;
use Math::BigInt;
use Fcntl "SEEK_SET";
-die "Format: $0 [-s <systemmap-file>] <vmlinux-file> <keyring-file>\n"
+die "Format: $0 [-s <systemmap-file>] <vmtronx-file> <keyring-file>\n"
if ($#ARGV != 1 && $#ARGV != 3 ||
$#ARGV == 3 && $ARGV[0] ne "-s");
@@ -15,15 +15,15 @@ if ($#ARGV == 3) {
shift;
}
-my $vmlinux = $ARGV[0];
+my $vmtronx = $ARGV[0];
my $keyring = $ARGV[1];
#
-# Parse the vmlinux section table
+# Parse the vmtronx section table
#
-open FD, "objdump -h $vmlinux |" || die $vmlinux;
+open FD, "objdump -h $vmtronx |" || die $vmtronx;
my @lines = <FD>;
-close(FD) || die $vmlinux;
+close(FD) || die $vmtronx;
my @sections = ();
@@ -49,12 +49,12 @@ foreach my $line (@lines) {
print "Have $#sections sections\n";
#
-# Try and parse the vmlinux symbol table. If the vmlinux file has been created
-# from a vmlinuz file with extract-vmlinux then the symbol table will be empty.
+# Try and parse the vmtronx symbol table. If the vmtronx file has been created
+# from a vmtronz file with extract-vmtronx then the symbol table will be empty.
#
-open FD, "nm $vmlinux 2>/dev/null |" || die $vmlinux;
+open FD, "nm $vmtronx 2>/dev/null |" || die $vmtronx;
@lines = <FD>;
-close(FD) || die $vmlinux;
+close(FD) || die $vmtronx;
my %symbols = ();
my $nr_symbols = 0;
@@ -76,7 +76,7 @@ sub parse_symbols(@) {
parse_symbols(@lines);
if ($nr_symbols == 0 && $sysmap ne "") {
- print "No symbols in vmlinux, trying $sysmap\n";
+ print "No symbols in vmtronx, trying $sysmap\n";
open FD, "<$sysmap" || die $sysmap;
@lines = <FD>;
@@ -127,14 +127,14 @@ my $foff = $start - $s->{vma} + $s->{foff};
printf "Certificate list at file offset 0x%x\n", $foff;
-open FD, "<$vmlinux" || die $vmlinux;
+open FD, "<$vmtronx" || die $vmtronx;
binmode(FD);
-die $vmlinux if (!defined(sysseek(FD, $foff, SEEK_SET)));
+die $vmtronx if (!defined(sysseek(FD, $foff, SEEK_SET)));
my $buf = "";
my $len = sysread(FD, $buf, $size);
-die "$vmlinux" if (!defined($len));
-die "Short read on $vmlinux\n" if ($len != $size);
-close(FD) || die $vmlinux;
+die "$vmtronx" if (!defined($len));
+die "Short read on $vmtronx\n" if ($len != $size);
+close(FD) || die $vmtronx;
open FD, ">$keyring" || die $keyring;
binmode(FD);
diff --git a/tkernel_source/scripts/extract-vmlinux b/tkernel_source/scripts/extract-vmlinux
deleted file mode 100755
index 5061abc..0000000
--- a/tkernel_source/scripts/extract-vmlinux
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------
-# extract-vmlinux - Extract uncompressed vmlinux from a kernel image
-#
-# Inspired from extract-ikconfig
-# (c) 2009,2010 Dick Streefland <dick@xxxxxxxxxxxxxx>
-#
-# (c) 2011 Corentin Chary <corentin.chary@xxxxxxxxx>
-#
-# Licensed under the GNU General Public License, version 2 (GPLv2).
-# ----------------------------------------------------------------------
-
-check_vmlinux()
-{
- # Use readelf to check if it's a valid ELF
- # TODO: find a better to way to check that it's really vmlinux
- # and not just an elf
- readelf -h $1 > /dev/null 2>&1 || return 1
-
- cat $1
- exit 0
-}
-
-try_decompress()
-{
- # The obscure use of the "tr" filter is to work around older versions of
- # "grep" that report the byte offset of the line instead of the pattern.
-
- # Try to find the header ($1) and decompress from here
- for pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
- do
- pos=${pos%%:*}
- tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
- check_vmlinux $tmp
- done
-}
-
-# Check invocation:
-me=${0##*/}
-img=$1
-if [ $# -ne 1 -o ! -s "$img" ]
-then
- echo "Usage: $me <kernel-image>" >&2
- exit 2
-fi
-
-# Prepare temp files:
-tmp=$(mktemp /tmp/vmlinux-XXX)
-trap "rm -f $tmp" 0
-
-# Initial attempt for uncompressed images or objects:
-check_vmlinux $img
-
-# That didn't work, so retry after decompression.
-try_decompress '\037\213\010' xy gunzip
-try_decompress '\3757zXZ\000' abcde unxz
-try_decompress 'BZh' xy bunzip2
-try_decompress '\135\0\0\0' xxx unlzma
-try_decompress '\211\114\132' xy 'lzop -d'
-
-# Bail out:
-echo "$me: Cannot find vmlinux." >&2
diff --git a/tkernel_source/scripts/extract-vmtronx b/tkernel_source/scripts/extract-vmtronx
new file mode 100755
index 0000000..36dad61
--- /dev/null
+++ b/tkernel_source/scripts/extract-vmtronx
@@ -0,0 +1,62 @@
+#!/bin/sh
+# ----------------------------------------------------------------------
+# extract-vmtronx - Extract uncompressed vmtronx from a kernel image
+#
+# Inspired from extract-ikconfig
+# (c) 2009,2010 Dick Streefland <dick@xxxxxxxxxxxxxx>
+#
+# (c) 2011 Corentin Chary <corentin.chary@xxxxxxxxx>
+#
+# Licensed under the GNU General Public License, version 2 (GPLv2).
+# ----------------------------------------------------------------------
+
+check_vmtronx()
+{
+ # Use readelf to check if it's a valid ELF
+ # TODO: find a better to way to check that it's really vmtronx
+ # and not just an elf
+ readelf -h $1 > /dev/null 2>&1 || return 1
+
+ cat $1
+ exit 0
+}
+
+try_decompress()
+{
+ # The obscure use of the "tr" filter is to work around older versions of
+ # "grep" that report the byte offset of the line instead of the pattern.
+
+ # Try to find the header ($1) and decompress from here
+ for pos in `tr "$1\n$2" "\n$2=" < "$img" | grep -abo "^$2"`
+ do
+ pos=${pos%%:*}
+ tail -c+$pos "$img" | $3 > $tmp 2> /dev/null
+ check_vmtronx $tmp
+ done
+}
+
+# Check invocation:
+me=${0##*/}
+img=$1
+if [ $# -ne 1 -o ! -s "$img" ]
+then
+ echo "Usage: $me <kernel-image>" >&2
+ exit 2
+fi
+
+# Prepare temp files:
+tmp=$(mktemp /tmp/vmtronx-XXX)
+trap "rm -f $tmp" 0
+
+# Initial attempt for uncompressed images or objects:
+check_vmtronx $img
+
+# That didn't work, so retry after decompression.
+try_decompress '\037\213\010' xy gunzip
+try_decompress '\3757zXZ\000' abcde unxz
+try_decompress 'BZh' xy bunzip2
+try_decompress '\135\0\0\0' xxx unlzma
+try_decompress '\211\114\132' xy 'lzop -d'
+
+# Bail out:
+echo "$me: Cannot find vmtronx." >&2
diff --git a/tkernel_source/scripts/gdb/linux/symbols.py b/tkernel_source/scripts/gdb/linux/symbols.py
index 627750c..3f40809 100644
--- a/tkernel_source/scripts/gdb/linux/symbols.py
+++ b/tkernel_source/scripts/gdb/linux/symbols.py
@@ -56,7 +56,7 @@ if hasattr(gdb, 'Breakpoint'):
class LxSymbols(gdb.Command):
"""(Re-)load symbols of Linux kernel and currently loaded modules.
-The kernel (vmlinux) is taken from the current working directly. Modules (.ko)
+The kernel (vmtronx) is taken from the current working directly. Modules (.ko)
are scanned recursively, starting in the same directory. Optionally, the module
search path can be extended by a space separated list of paths passed to the
lx-symbols command."""
@@ -129,7 +129,7 @@ lx-symbols command."""
gdb.write("no module object found for '{0}'\n".format(module_name))
def load_all_symbols(self):
- gdb.write("loading vmlinux\n")
+ gdb.write("loading vmtronx\n")
# Dropping symbols will disable all breakpoints. So save their states
# and restore them afterward.
@@ -138,9 +138,9 @@ lx-symbols command."""
for bp in gdb.breakpoints():
saved_states.append({'breakpoint': bp, 'enabled': bp.enabled})
- # drop all current symbols and reload vmlinux
+ # drop all current symbols and reload vmtronx
gdb.execute("symbol-file", to_string=True)
- gdb.execute("symbol-file vmlinux")
+ gdb.execute("symbol-file vmtronx")
self.loaded_modules = []
module_list = modules.module_list()
diff --git a/tkernel_source/scripts/gdb/vmlinux-gdb.py b/tkernel_source/scripts/gdb/vmlinux-gdb.py
deleted file mode 100644
index ce82bf5..0000000
--- a/tkernel_source/scripts/gdb/vmlinux-gdb.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# gdb helper commands and functions for Linux kernel debugging
-#
-# loader module
-#
-# Copyright (c) Siemens AG, 2012, 2013
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
-#
-# This work is licensed under the terms of the GNU GPL version 2.
-#
-
-import os
-
-sys.path.insert(0, os.path.dirname(__file__) + "/scripts/gdb")
-
-try:
- gdb.parse_and_eval("0")
- gdb.execute("", to_string=True)
-except:
- gdb.write("NOTE: gdb 7.2 or later required for Linux helper scripts to "
- "work.\n")
-else:
- import linux.utils
- import linux.symbols
- import linux.modules
- import linux.dmesg
- import linux.tasks
- import linux.cpus
- import linux.lists
diff --git a/tkernel_source/scripts/gdb/vmtronx-gdb.py b/tkernel_source/scripts/gdb/vmtronx-gdb.py
new file mode 100644
index 0000000..ce82bf5
--- /dev/null
+++ b/tkernel_source/scripts/gdb/vmtronx-gdb.py
@@ -0,0 +1,31 @@
+#
+# gdb helper commands and functions for Linux kernel debugging
+#
+# loader module
+#
+# Copyright (c) Siemens AG, 2012, 2013
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
+#
+# This work is licensed under the terms of the GNU GPL version 2.
+#
+
+import os
+
+sys.path.insert(0, os.path.dirname(__file__) + "/scripts/gdb")
+
+try:
+ gdb.parse_and_eval("0")
+ gdb.execute("", to_string=True)
+except:
+ gdb.write("NOTE: gdb 7.2 or later required for Linux helper scripts to "
+ "work.\n")
+else:
+ import linux.utils
+ import linux.symbols
+ import linux.modules
+ import linux.dmesg
+ import linux.tasks
+ import linux.cpus
+ import linux.lists
diff --git a/tkernel_source/scripts/kallsyms.c b/tkernel_source/scripts/kallsyms.c
index 8fa81e8..b913eb0 100644
--- a/tkernel_source/scripts/kallsyms.c
+++ b/tkernel_source/scripts/kallsyms.c
@@ -5,7 +5,7 @@
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
- * Usage: nm -n vmlinux | scripts/kallsyms [--all-symbols] > symbols.S
+ * Usage: nm -n vmtronx | scripts/kallsyms [--all-symbols] > symbols.S
*
* Table compression uses all the unused char codes on the symbols and
* maps these to the most used substrings (tokens). For instance, it might
diff --git a/tkernel_source/scripts/kconfig/streamline_config.pl b/tkernel_source/scripts/kconfig/streamline_config.pl
index f3d3fb4..e6d330b 100755
--- a/tkernel_source/scripts/kconfig/streamline_config.pl
+++ b/tkernel_source/scripts/kconfig/streamline_config.pl
@@ -74,12 +74,12 @@ my @searchconfigs = (
"exec" => "cat",
},
{
- "file" => "/boot/vmlinuz-$uname",
+ "file" => "/boot/vmtronz-$uname",
"exec" => "scripts/extract-ikconfig",
"test" => "scripts/extract-ikconfig",
},
{
- "file" => "vmlinux",
+ "file" => "vmtronx",
"exec" => "scripts/extract-ikconfig",
"test" => "scripts/extract-ikconfig",
},
diff --git a/tkernel_source/scripts/link-vmlinux.sh b/tkernel_source/scripts/link-vmlinux.sh
deleted file mode 100755
index dacf71a..0000000
--- a/tkernel_source/scripts/link-vmlinux.sh
+++ /dev/null
@@ -1,252 +0,0 @@
-#!/bin/sh
-#
-# link vmlinux
-#
-# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
-# $(KBUILD_VMLINUX_MAIN). Most are built-in.o files from top-level directories
-# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
-# Ordering when linking is important, and $(KBUILD_VMLINUX_INIT) must be first.
-#
-# vmlinux
-# ^
-# |
-# +-< $(KBUILD_VMLINUX_INIT)
-# | +--< init/version.o + more
-# |
-# +--< $(KBUILD_VMLINUX_MAIN)
-# | +--< drivers/built-in.o mm/built-in.o + more
-# |
-# +-< ${kallsymso} (see description in KALLSYMS section)
-#
-# vmlinux version (uname -v) cannot be updated during normal
-# descending-into-subdirs phase since we do not yet know if we need to
-# update vmlinux.
-# Therefore this step is delayed until just before final link of vmlinux.
-#
-# System.map is generated to document addresses of all kernel symbols
-
-# Error out on error
-set -e
-
-# Nice output in kbuild format
-# Will be supressed by "make -s"
-info()
-{
- if [ "${quiet}" != "silent_" ]; then
- printf " %-7s %s\n" ${1} ${2}
- fi
-}
-
-# Link of vmlinux.o used for section mismatch analysis
-# ${1} output file
-modpost_link()
-{
- ${LD} ${LDFLAGS} -r -o ${1} ${KBUILD_VMLINUX_INIT} \
- --start-group ${KBUILD_VMLINUX_MAIN} --end-group
-}
-
-# Link of vmlinux
-# ${1} - optional extra .o files
-# ${2} - output file
-vmlinux_link()
-{
- local lds="${objtree}/${KBUILD_LDS}"
-
- if [ "${SRCARCH}" != "um" ]; then
- ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2} \
- -T ${lds} ${KBUILD_VMLINUX_INIT} \
- --start-group ${KBUILD_VMLINUX_MAIN} --end-group ${1}
- else
- ${CC} ${CFLAGS_vmlinux} -o ${2} \
- -Wl,-T,${lds} ${KBUILD_VMLINUX_INIT} \
- -Wl,--start-group \
- ${KBUILD_VMLINUX_MAIN} \
- -Wl,--end-group \
- -lutil -lrt ${1}
- rm -f linux
- fi
-}
-
-
-# Create ${2} .o file with all symbols from the ${1} object file
-kallsyms()
-{
- info KSYM ${2}
- local kallsymopt;
-
- if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
- kallsymopt="${kallsymopt} --symbol-prefix=_"
- fi
-
- if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
- kallsymopt="${kallsymopt} --all-symbols"
- fi
-
- if [ -n "${CONFIG_ARM}" ] && [ -z "${CONFIG_XIP_KERNEL}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
- kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
- fi
-
- if [ -n "${CONFIG_X86_64}" ]; then
- kallsymopt="${kallsymopt} --absolute-percpu"
- fi
-
- local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
- ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
-
- ${NM} -n ${1} | \
- scripts/kallsyms ${kallsymopt} | \
- ${CC} ${aflags} -c -o ${2} -x assembler-with-cpp -
-}
-
-# Create map file with all symbols from ${1}
-# See mksymap for additional details
-mksysmap()
-{
- ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
-}
-
-sortextable()
-{
- ${objtree}/scripts/sortextable ${1}
-}
-
-# Delete output files in case of error
-cleanup()
-{
- rm -f .old_version
- rm -f .tmp_System.map
- rm -f .tmp_kallsyms*
- rm -f .tmp_version
- rm -f .tmp_vmlinux*
- rm -f System.map
- rm -f vmlinux
- rm -f vmlinux.o
-}
-
-on_exit()
-{
- if [ $? -ne 0 ]; then
- cleanup
- fi
-}
-trap on_exit EXIT
-
-on_signals()
-{
- exit 1
-}
-trap on_signals HUP INT QUIT TERM
-
-#
-#
-# Use "make V=1" to debug this script
-case "${KBUILD_VERBOSE}" in
-*1*)
- set -x
- ;;
-esac
-
-if [ "$1" = "clean" ]; then
- cleanup
- exit 0
-fi
-
-# We need access to CONFIG_ symbols
-case "${KCONFIG_CONFIG}" in
-*/*)
- . "${KCONFIG_CONFIG}"
- ;;
-*)
- # Force using a file from the current directory
- . "./${KCONFIG_CONFIG}"
-esac
-
-#link vmlinux.o
-info LD vmlinux.o
-modpost_link vmlinux.o
-
-# modpost vmlinux.o to check for section mismatches
-${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
-
-# Update version
-info GEN .version
-if [ ! -r .version ]; then
- rm -f .version;
- echo 1 >.version;
-else
- mv .version .old_version;
- expr 0$(cat .old_version) + 1 >.version;
-fi;
-
-# final build of init/
-${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
-
-kallsymso=""
-kallsyms_vmlinux=""
-if [ -n "${CONFIG_KALLSYMS}" ]; then
-
- # kallsyms support
- # Generate section listing all symbols and add it into vmlinux
- # It's a three step process:
- # 1) Link .tmp_vmlinux1 so it has all symbols and sections,
- # but __kallsyms is empty.
- # Running kallsyms on that gives us .tmp_kallsyms1.o with
- # the right size
- # 2) Link .tmp_vmlinux2 so it now has a __kallsyms section of
- # the right size, but due to the added section, some
- # addresses have shifted.
- # From here, we generate a correct .tmp_kallsyms2.o
- # 2a) We may use an extra pass as this has been necessary to
- # woraround some alignment related bugs.
- # KALLSYMS_EXTRA_PASS=1 is used to trigger this.
- # 3) The correct ${kallsymso} is linked into the final vmlinux.
- #
- # a) Verify that the System.map from vmlinux matches the map from
- # ${kallsymso}.
-
- kallsymso=.tmp_kallsyms2.o
- kallsyms_vmlinux=.tmp_vmlinux2
-
- # step 1
- vmlinux_link "" .tmp_vmlinux1
- kallsyms .tmp_vmlinux1 .tmp_kallsyms1.o
-
- # step 2
- vmlinux_link .tmp_kallsyms1.o .tmp_vmlinux2
- kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
-
- # step 2a
- if [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
- kallsymso=.tmp_kallsyms3.o
- kallsyms_vmlinux=.tmp_vmlinux3
-
- vmlinux_link .tmp_kallsyms2.o .tmp_vmlinux3
-
- kallsyms .tmp_vmlinux3 .tmp_kallsyms3.o
- fi
-fi
-
-info LD vmlinux
-vmlinux_link "${kallsymso}" vmlinux
-
-if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
- info SORTEX vmlinux
- sortextable vmlinux
-fi
-
-info SYSMAP System.map
-mksysmap vmlinux System.map
-
-# step a (see comment above)
-if [ -n "${CONFIG_KALLSYMS}" ]; then
- mksysmap ${kallsyms_vmlinux} .tmp_System.map
-
- if ! cmp -s System.map .tmp_System.map; then
- echo >&2 Inconsistent kallsyms data
- echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
- exit 1
- fi
-fi
-
-# We made a new kernel - delete old version file
-rm -f .old_version
diff --git a/tkernel_source/scripts/link-vmtronx.sh b/tkernel_source/scripts/link-vmtronx.sh
new file mode 100755
index 0000000..32a67c5
--- /dev/null
+++ b/tkernel_source/scripts/link-vmtronx.sh
@@ -0,0 +1,252 @@
+#!/bin/sh
+#
+# link vmtronx
+#
+# vmtronx is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
+# $(KBUILD_VMLINUX_MAIN). Most are built-in.o files from top-level directories
+# in the kernel tree, others are specified in arch/$(ARCH)/Makefile.
+# Ordering when linking is important, and $(KBUILD_VMLINUX_INIT) must be first.
+#
+# vmtronx
+# ^
+# |
+# +-< $(KBUILD_VMLINUX_INIT)
+# | +--< init/version.o + more
+# |
+# +--< $(KBUILD_VMLINUX_MAIN)
+# | +--< drivers/built-in.o mm/built-in.o + more
+# |
+# +-< ${kallsymso} (see description in KALLSYMS section)
+#
+# vmtronx version (uname -v) cannot be updated during normal
+# descending-into-subdirs phase since we do not yet know if we need to
+# update vmtronx.
+# Therefore this step is delayed until just before final link of vmtronx.
+#
+# System.map is generated to document addresses of all kernel symbols
+
+# Error out on error
+set -e
+
+# Nice output in kbuild format
+# Will be supressed by "make -s"
+info()
+{
+ if [ "${quiet}" != "silent_" ]; then
+ printf " %-7s %s\n" ${1} ${2}
+ fi
+}
+
+# Link of vmtronx.o used for section mismatch analysis
+# ${1} output file
+modpost_link()
+{
+ ${LD} ${LDFLAGS} -r -o ${1} ${KBUILD_VMLINUX_INIT} \
+ --start-group ${KBUILD_VMLINUX_MAIN} --end-group
+}
+
+# Link of vmtronx
+# ${1} - optional extra .o files
+# ${2} - output file
+vmtronx_link()
+{
+ local lds="${objtree}/${KBUILD_LDS}"
+
+ if [ "${SRCARCH}" != "um" ]; then
+ ${LD} ${LDFLAGS} ${LDFLAGS_vmtronx} -o ${2} \
+ -T ${lds} ${KBUILD_VMLINUX_INIT} \
+ --start-group ${KBUILD_VMLINUX_MAIN} --end-group ${1}
+ else
+ ${CC} ${CFLAGS_vmtronx} -o ${2} \
+ -Wl,-T,${lds} ${KBUILD_VMLINUX_INIT} \
+ -Wl,--start-group \
+ ${KBUILD_VMLINUX_MAIN} \
+ -Wl,--end-group \
+ -lutil -lrt ${1}
+ rm -f linux
+ fi
+}
+
+
+# Create ${2} .o file with all symbols from the ${1} object file
+kallsyms()
+{
+ info KSYM ${2}
+ local kallsymopt;
+
+ if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
+ kallsymopt="${kallsymopt} --symbol-prefix=_"
+ fi
+
+ if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
+ kallsymopt="${kallsymopt} --all-symbols"
+ fi
+
+ if [ -n "${CONFIG_ARM}" ] && [ -z "${CONFIG_XIP_KERNEL}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
+ kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+ fi
+
+ if [ -n "${CONFIG_X86_64}" ]; then
+ kallsymopt="${kallsymopt} --absolute-percpu"
+ fi
+
+ local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \
+ ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
+
+ ${NM} -n ${1} | \
+ scripts/kallsyms ${kallsymopt} | \
+ ${CC} ${aflags} -c -o ${2} -x assembler-with-cpp -
+}
+
+# Create map file with all symbols from ${1}
+# See mksymap for additional details
+mksysmap()
+{
+ ${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
+}
+
+sortextable()
+{
+ ${objtree}/scripts/sortextable ${1}
+}
+
+# Delete output files in case of error
+cleanup()
+{
+ rm -f .old_version
+ rm -f .tmp_System.map
+ rm -f .tmp_kallsyms*
+ rm -f .tmp_version
+ rm -f .tmp_vmtronx*
+ rm -f System.map
+ rm -f vmtronx
+ rm -f vmtronx.o
+}
+
+on_exit()
+{
+ if [ $? -ne 0 ]; then
+ cleanup
+ fi
+}
+trap on_exit EXIT
+
+on_signals()
+{
+ exit 1
+}
+trap on_signals HUP INT QUIT TERM
+
+#
+#
+# Use "make V=1" to debug this script
+case "${KBUILD_VERBOSE}" in
+*1*)
+ set -x
+ ;;
+esac
+
+if [ "$1" = "clean" ]; then
+ cleanup
+ exit 0
+fi
+
+# We need access to CONFIG_ symbols
+case "${KCONFIG_CONFIG}" in
+*/*)
+ . "${KCONFIG_CONFIG}"
+ ;;
+*)
+ # Force using a file from the current directory
+ . "./${KCONFIG_CONFIG}"
+esac
+
+#link vmtronx.o
+info LD vmtronx.o
+modpost_link vmtronx.o
+
+# modpost vmtronx.o to check for section mismatches
+${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmtronx.o
+
+# Update version
+info GEN .version
+if [ ! -r .version ]; then
+ rm -f .version;
+ echo 1 >.version;
+else
+ mv .version .old_version;
+ expr 0$(cat .old_version) + 1 >.version;
+fi;
+
+# final build of init/
+# ${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
+
+kallsymso=""
+kallsyms_vmtronx=""
+if [ -n "${CONFIG_KALLSYMS}" ]; then
+
+ # kallsyms support
+ # Generate section listing all symbols and add it into vmtronx
+ # It's a three step process:
+ # 1) Link .tmp_vmtronx1 so it has all symbols and sections,
+ # but __kallsyms is empty.
+ # Running kallsyms on that gives us .tmp_kallsyms1.o with
+ # the right size
+ # 2) Link .tmp_vmtronx2 so it now has a __kallsyms section of
+ # the right size, but due to the added section, some
+ # addresses have shifted.
+ # From here, we generate a correct .tmp_kallsyms2.o
+ # 2a) We may use an extra pass as this has been necessary to
+ # woraround some alignment related bugs.
+ # KALLSYMS_EXTRA_PASS=1 is used to trigger this.
+ # 3) The correct ${kallsymso} is linked into the final vmtronx.
+ #
+ # a) Verify that the System.map from vmtronx matches the map from
+ # ${kallsymso}.
+
+ kallsymso=.tmp_kallsyms2.o
+ kallsyms_vmtronx=.tmp_vmtronx2
+
+ # step 1
+ vmtronx_link "" .tmp_vmtronx1
+ kallsyms .tmp_vmtronx1 .tmp_kallsyms1.o
+
+ # step 2
+ vmtronx_link .tmp_kallsyms1.o .tmp_vmtronx2
+ kallsyms .tmp_vmtronx2 .tmp_kallsyms2.o
+
+ # step 2a
+ if [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
+ kallsymso=.tmp_kallsyms3.o
+ kallsyms_vmtronx=.tmp_vmtronx3
+
+ vmtronx_link .tmp_kallsyms2.o .tmp_vmtronx3
+
+ kallsyms .tmp_vmtronx3 .tmp_kallsyms3.o
+ fi
+fi
+
+info LD vmtronx
+vmtronx_link "${kallsymso}" vmtronx
+
+if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
+ info SORTEX vmtronx
+ sortextable vmtronx
+fi
+
+info SYSMAP System.map
+mksysmap vmtronx System.map
+
+# step a (see comment above)
+if [ -n "${CONFIG_KALLSYMS}" ]; then
+ mksysmap ${kallsyms_vmtronx} .tmp_System.map
+
+ if ! cmp -s System.map .tmp_System.map; then
+ echo >&2 Inconsistent kallsyms data
+ echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
+ exit 1
+ fi
+fi
+
+# We made a new kernel - delete old version file
+rm -f .old_version
diff --git a/tkernel_source/scripts/markup_oops.pl b/tkernel_source/scripts/markup_oops.pl
index c21d163..5c8b758 100755
--- a/tkernel_source/scripts/markup_oops.pl
+++ b/tkernel_source/scripts/markup_oops.pl
@@ -17,7 +17,7 @@ use Getopt::Long;
my $cross_compile = "";
-my $vmlinux_name = "";
+my $vmtronx_name = "";
my $modulefile = "";
# Get options
@@ -26,14 +26,14 @@ Getopt::Long::GetOptions(
'module|m=s' => \$modulefile,
'help|h' => \&usage,
) || usage ();
-my $vmlinux_name = $ARGV[0];
-if (!defined($vmlinux_name)) {
+my $vmtronx_name = $ARGV[0];
+if (!defined($vmtronx_name)) {
my $kerver = `uname -r`;
chomp($kerver);
- $vmlinux_name = "/lib/modules/$kerver/build/vmlinux";
- print "No vmlinux specified, assuming $vmlinux_name\n";
+ $vmtronx_name = "/lib/modules/$kerver/build/vmtronx";
+ print "No vmtronx specified, assuming $vmtronx_name\n";
}
-my $filename = $vmlinux_name;
+my $filename = $vmtronx_name;
# Parse the oops to find the EIP value
diff --git a/tkernel_source/scripts/mksysmap b/tkernel_source/scripts/mksysmap
index a35acc0..3a2dd99 100755
--- a/tkernel_source/scripts/mksysmap
+++ b/tkernel_source/scripts/mksysmap
@@ -1,10 +1,10 @@
#!/bin/sh -x
-# Based on the vmlinux file create the System.map file
+# Based on the vmtronx file create the System.map file
# System.map is used by module-init tools and some debugging
# tools to retrieve the actual addresses of symbols in the kernel.
#
# Usage
-# mksysmap vmlinux System.map
+# mksysmap vmtronx System.map
#####
diff --git a/tkernel_source/scripts/mod/modpost.c b/tkernel_source/scripts/mod/modpost.c
index e080746..b384f24 100644
--- a/tkernel_source/scripts/mod/modpost.c
+++ b/tkernel_source/scripts/mod/modpost.c
@@ -8,7 +8,7 @@
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*
- * Usage: modpost vmlinux module1.o module2.o ...
+ * Usage: modpost vmtronx module1.o module2.o ...
*/
#define _GNU_SOURCE
@@ -25,14 +25,14 @@
/* Are we using CONFIG_MODVERSIONS? */
static int modversions = 0;
-/* Warn about undefined symbols? (do so if we have vmlinux) */
-static int have_vmlinux = 0;
+/* Warn about undefined symbols? (do so if we have vmtronx) */
+static int have_vmtronx = 0;
/* Is CONFIG_MODULE_SRCVERSION_ALL set? */
static int all_versions = 0;
/* If we are modposting external module set to 1 */
static int external_module = 0;
-/* Warn about section mismatch in vmlinux if set to 1 */
-static int vmlinux_section_warnings = 1;
+/* Warn about section mismatch in vmtronx if set to 1 */
+static int vmtronx_section_warnings = 1;
/* Only warn about unresolved symbols */
static int warn_unresolved = 0;
/* How a symbol is exported */
@@ -92,7 +92,7 @@ static inline bool strends(const char *str, const char *postfix)
return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
}
-static int is_vmlinux(const char *modname)
+static int is_vmtronx(const char *modname)
{
const char *myname;
@@ -102,8 +102,8 @@ static int is_vmlinux(const char *modname)
else
myname = modname;
- return (strcmp(myname, "vmlinux") == 0) ||
- (strcmp(myname, "vmlinux.o") == 0);
+ return (strcmp(myname, "vmtronx") == 0) ||
+ (strcmp(myname, "vmtronx.o") == 0);
}
void *do_nofail(void *ptr, const char *expr)
@@ -162,7 +162,7 @@ struct symbol {
unsigned int crc;
int crc_valid;
unsigned int weak:1;
- unsigned int vmlinux:1; /* 1 if symbol is defined in vmlinux */
+ unsigned int vmtronx:1; /* 1 if symbol is defined in vmtronx */
unsigned int kernel:1; /* 1 if symbol is from kernel
* (only for external modules) **/
unsigned int preloaded:1; /* 1 if symbol from Module.symvers, or crc */
@@ -315,14 +315,14 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod,
warn("%s: '%s' exported twice. Previous export "
"was in %s%s\n", mod->name, name,
s->module->name,
- is_vmlinux(s->module->name) ?"":".ko");
+ is_vmtronx(s->module->name) ?"":".ko");
} else {
/* In case Module.symvers was out of date */
s->module = mod;
}
}
s->preloaded = 0;
- s->vmlinux = is_vmlinux(mod->name);
+ s->vmtronx = is_vmtronx(mod->name);
s->kernel = 0;
s->export = export;
return s;
@@ -609,7 +609,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
unsigned int crc;
enum export export;
- if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
+ if ((!is_vmtronx(mod->name) || mod->is_dot_o) &&
strncmp(symname, "__ksymtab", 9) == 0)
export = export_from_secname(info, get_secindex(info, sym));
else
@@ -1936,15 +1936,15 @@ static void read_symbols(char *modname)
mod = new_module(modname);
- /* When there's no vmlinux, don't print warnings about
+ /* When there's no vmtronx, don't print warnings about
* unresolved symbols (since there'll be too many ;) */
- if (is_vmlinux(modname)) {
- have_vmlinux = 1;
+ if (is_vmtronx(modname)) {
+ have_vmtronx = 1;
mod->skip = 1;
}
license = get_modinfo(info.modinfo, info.modinfo_len, "license");
- if (info.modinfo && !license && !is_vmlinux(modname))
+ if (info.modinfo && !license && !is_vmtronx(modname))
warn("modpost: missing MODULE_LICENSE() in %s\n"
"see include/linux/module.h for "
"more information\n", modname);
@@ -1965,15 +1965,15 @@ static void read_symbols(char *modname)
handle_modversions(mod, &info, sym, symname);
handle_moddevtable(mod, &info, sym, symname);
}
- if (!is_vmlinux(modname) ||
- (is_vmlinux(modname) && vmlinux_section_warnings))
+ if (!is_vmtronx(modname) ||
+ (is_vmtronx(modname) && vmtronx_section_warnings))
check_sec_ref(mod, modname, &info);
version = get_modinfo(info.modinfo, info.modinfo_len, "version");
if (version)
maybe_frob_rcs_version(modname, version, info.modinfo,
version - (char *)info.hdr);
- if (version || (all_versions && !is_vmlinux(modname)))
+ if (version || (all_versions && !is_vmtronx(modname)))
get_src_version(modname, mod->srcversion,
sizeof(mod->srcversion)-1);
@@ -2039,7 +2039,7 @@ void buf_write(struct buffer *buf, const char *s, int len)
static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
{
- const char *e = is_vmlinux(m) ?"":".ko";
+ const char *e = is_vmtronx(m) ?"":".ko";
switch (exp) {
case export_gpl:
@@ -2064,7 +2064,7 @@ static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
static void check_for_unused(enum export exp, const char *m, const char *s)
{
- const char *e = is_vmlinux(m) ?"":".ko";
+ const char *e = is_vmtronx(m) ?"":".ko";
switch (exp) {
case export_unused:
@@ -2152,7 +2152,7 @@ static int add_versions(struct buffer *b, struct module *mod)
for (s = mod->unres; s; s = s->next) {
exp = find_symbol(s->name);
if (!exp || exp->module == mod) {
- if (have_vmlinux && !s->weak) {
+ if (have_vmtronx && !s->weak) {
if (warn_unresolved) {
warn("\"%s\" [%s.ko] undefined!\n",
s->name, mod->name);
@@ -2208,7 +2208,7 @@ static void add_depends(struct buffer *b, struct module *mod,
int first = 1;
for (m = modules; m; m = m->next)
- m->seen = is_vmlinux(m->name);
+ m->seen = is_vmtronx(m->name);
buf_printf(b, "\n");
buf_printf(b, "static const char __module_depends[]\n");
@@ -2322,8 +2322,8 @@ static void read_dump(const char *fname, unsigned int kernel)
goto fail;
mod = find_module(modname);
if (!mod) {
- if (is_vmlinux(modname))
- have_vmlinux = 1;
+ if (is_vmtronx(modname))
+ have_vmtronx = 1;
mod = new_module(modname);
mod->skip = 1;
}
@@ -2347,7 +2347,7 @@ static int dump_sym(struct symbol *sym)
{
if (!external_module)
return 1;
- if (sym->vmlinux || sym->kernel)
+ if (sym->vmtronx || sym->kernel)
return 0;
return 1;
}
@@ -2418,7 +2418,7 @@ int main(int argc, char **argv)
all_versions = 1;
break;
case 's':
- vmlinux_section_warnings = 0;
+ vmtronx_section_warnings = 0;
break;
case 'S':
sec_mismatch_verbose = 0;
diff --git a/tkernel_source/scripts/namespace.pl b/tkernel_source/scripts/namespace.pl
index a71be6b..1f86be2 100755
--- a/tkernel_source/scripts/namespace.pl
+++ b/tkernel_source/scripts/namespace.pl
@@ -17,7 +17,7 @@
#
# The source must be compiled/assembled first, the object files
# are the primary input to this script. Incomplete or missing
-# objects will result in a flawed analysis. Compile both vmlinux
+# objects will result in a flawed analysis. Compile both vmtronx
# and modules.
#
# Even with complete objects, treat the result of the analysis
@@ -206,7 +206,7 @@ sub linux_objects
|| m:sound/.*/snd-:
|| m:^.*/\.tmp_:
|| m:^\.tmp_:
- || m:/vmlinux-obj.o$:
+ || m:/vmtronx-obj.o$:
|| m:^tools/:
)
) {
diff --git a/tkernel_source/scripts/package/builddeb b/tkernel_source/scripts/package/builddeb
index 6c3b038..db4676e 100755
--- a/tkernel_source/scripts/package/builddeb
+++ b/tkernel_source/scripts/package/builddeb
@@ -115,10 +115,10 @@ um)
installed_image_path="usr/bin/linux-$version"
;;
parisc|mips|powerpc)
- installed_image_path="boot/vmlinux-$version"
+ installed_image_path="boot/vmtronx-$version"
;;
*)
- installed_image_path="boot/vmlinuz-$version"
+ installed_image_path="boot/vmtronz-$version"
esac
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
@@ -384,12 +384,12 @@ if [ -n "$BUILD_DEBUG" ] ; then
# Different tools want the image in different locations
# perf
mkdir -p $dbg_dir/usr/lib/debug/lib/modules/$version/
- cp vmlinux $dbg_dir/usr/lib/debug/lib/modules/$version/
+ cp vmtronx $dbg_dir/usr/lib/debug/lib/modules/$version/
# systemtap
mkdir -p $dbg_dir/usr/lib/debug/boot/
- ln -s ../lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/boot/vmlinux-$version
+ ln -s ../lib/modules/$version/vmtronx $dbg_dir/usr/lib/debug/boot/vmtronx-$version
# kdump-tools
- ln -s lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/vmlinux-$version
+ ln -s lib/modules/$version/vmtronx $dbg_dir/usr/lib/debug/vmtronx-$version
cat <<EOF >> debian/control
diff --git a/tkernel_source/scripts/package/buildtar b/tkernel_source/scripts/package/buildtar
index e046bff..8309edf 100755
--- a/tkernel_source/scripts/package/buildtar
+++ b/tkernel_source/scripts/package/buildtar
@@ -66,7 +66,7 @@ fi
#
cp -v -- "${objtree}/System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}"
cp -v -- "${objtree}/.config" "${tmpdir}/boot/config-${KERNELRELEASE}"
-cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+cp -v -- "${objtree}/vmtronx" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
#
@@ -74,42 +74,42 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
#
case "${ARCH}" in
x86|i386|x86_64)
- [ -f "${objtree}/arch/x86/boot/bzImage" ] && cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+ [ -f "${objtree}/arch/x86/boot/bzImage" ] && cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmtronz-${KERNELRELEASE}"
;;
alpha)
- [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+ [ -f "${objtree}/arch/alpha/boot/vmtronx.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmtronx.gz" "${tmpdir}/boot/vmtronz-${KERNELRELEASE}"
;;
parisc*)
- [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+ [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
[ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
;;
vax)
- [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
- [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
+ [ -f "${objtree}/vmtronx.SYS" ] && cp -v -- "${objtree}/vmtronx.SYS" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}.SYS"
+ [ -f "${objtree}/vmtronx.dsk" ] && cp -v -- "${objtree}/vmtronx.dsk" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}.dsk"
;;
mips)
- if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
- cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
- elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" ]; then
- cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.ecoff" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
- elif [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.srec" ]; then
- cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.srec" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
- elif [ -f "${objtree}/vmlinux.32" ]; then
- cp -v -- "${objtree}/vmlinux.32" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
- elif [ -f "${objtree}/vmlinux.64" ]; then
- cp -v -- "${objtree}/vmlinux.64" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
- elif [ -f "${objtree}/arch/mips/boot/vmlinux.bin" ]; then
- cp -v -- "${objtree}/arch/mips/boot/vmlinux.bin" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
- elif [ -f "${objtree}/arch/mips/boot/vmlinux.ecoff" ]; then
- cp -v -- "${objtree}/arch/mips/boot/vmlinux.ecoff" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
- elif [ -f "${objtree}/arch/mips/boot/vmlinux.srec" ]; then
- cp -v -- "${objtree}/arch/mips/boot/vmlinux.srec" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
- elif [ -f "${objtree}/vmlinux" ]; then
- cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
+ if [ -f "${objtree}/arch/mips/boot/compressed/vmtronx.bin" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/compressed/vmtronx.bin" "${tmpdir}/boot/vmtronz-${KERNELRELEASE}"
+ elif [ -f "${objtree}/arch/mips/boot/compressed/vmtronx.ecoff" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/compressed/vmtronx.ecoff" "${tmpdir}/boot/vmtronz-${KERNELRELEASE}"
+ elif [ -f "${objtree}/arch/mips/boot/compressed/vmtronx.srec" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/compressed/vmtronx.srec" "${tmpdir}/boot/vmtronz-${KERNELRELEASE}"
+ elif [ -f "${objtree}/vmtronx.32" ]; then
+ cp -v -- "${objtree}/vmtronx.32" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
+ elif [ -f "${objtree}/vmtronx.64" ]; then
+ cp -v -- "${objtree}/vmtronx.64" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
+ elif [ -f "${objtree}/arch/mips/boot/vmtronx.bin" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/vmtronx.bin" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
+ elif [ -f "${objtree}/arch/mips/boot/vmtronx.ecoff" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/vmtronx.ecoff" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
+ elif [ -f "${objtree}/arch/mips/boot/vmtronx.srec" ]; then
+ cp -v -- "${objtree}/arch/mips/boot/vmtronx.srec" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
+ elif [ -f "${objtree}/vmtronx" ]; then
+ cp -v -- "${objtree}/vmtronx" "${tmpdir}/boot/vmtronx-${KERNELRELEASE}"
fi
;;
*)
- [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
+ [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmtronx-kbuild-${KERNELRELEASE}"
echo "" >&2
echo '** ** ** WARNING ** ** **' >&2
echo "" >&2
diff --git a/tkernel_source/scripts/package/mkspec b/tkernel_source/scripts/package/mkspec
index 71004da..810aeec 100755
--- a/tkernel_source/scripts/package/mkspec
+++ b/tkernel_source/scripts/package/mkspec
@@ -94,14 +94,14 @@ echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw=
echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
echo "%ifarch ia64"
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
-echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
+echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmtronz-$KERNELRELEASE"
+echo 'ln -s '"efi/vmtronz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
echo "%else"
echo "%ifarch ppc64"
-echo "cp vmlinux arch/powerpc/boot"
-echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
+echo "cp vmtronx arch/powerpc/boot"
+echo "cp arch/powerpc/boot/"'$KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmtronz-$KERNELRELEASE"
echo "%else"
-echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmlinuz-$KERNELRELEASE"
+echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/vmtronz-$KERNELRELEASE"
echo "%endif"
echo "%endif"
@@ -111,14 +111,14 @@ echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$KERNELRELEASE"
echo 'cp .config $RPM_BUILD_ROOT'"/boot/config-$KERNELRELEASE"
echo "%ifnarch ppc64"
-echo 'bzip2 -9 --keep vmlinux'
-echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
+echo 'bzip2 -9 --keep vmtronx'
+echo 'mv vmtronx.bz2 $RPM_BUILD_ROOT'"/boot/vmtronx-$KERNELRELEASE.bz2"
echo "%endif"
if ! $PREBUILT; then
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
-echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
+echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmtronx* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
@@ -130,12 +130,12 @@ echo "%clean"
echo 'rm -rf $RPM_BUILD_ROOT'
echo ""
echo "%post"
-echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
-echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"
+echo "if [ -x /sbin/installkernel -a -r /boot/vmtronz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
+echo "cp /boot/vmtronz-$KERNELRELEASE /boot/vmtronz-$KERNELRELEASE-rpm"
echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"
-echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
-echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
-echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
+echo "rm -f /boot/vmtronz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
+echo "/sbin/installkernel $KERNELRELEASE /boot/vmtronz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
+echo "rm -f /boot/vmtronz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
echo "fi"
echo ""
echo "%files"
diff --git a/tkernel_source/scripts/recordmcount.pl b/tkernel_source/scripts/recordmcount.pl
index 96e2486..6559d98 100755
--- a/tkernel_source/scripts/recordmcount.pl
+++ b/tkernel_source/scripts/recordmcount.pl
@@ -8,7 +8,7 @@
#
# What we want to end up with this is that each object file will have a
# section called __mcount_loc that will hold the list of pointers to mcount
-# callers. After final linking, the vmlinux will have within .init.data the
+# callers. After final linking, the vmtronx will have within .init.data the
# list of all callers to mcount between __start_mcount_loc and __stop_mcount_loc.
# Later on boot up, the kernel will read this list, save the locations and turn
# them into nops. When tracing or profiling is later enabled, these locations
diff --git a/tkernel_source/scripts/sortextable.c b/tkernel_source/scripts/sortextable.c
index c2423d9..d907708 100644
--- a/tkernel_source/scripts/sortextable.c
+++ b/tkernel_source/scripts/sortextable.c
@@ -13,7 +13,7 @@
*/
/*
- * Strategy: alter the vmlinux file in-place.
+ * Strategy: alter the vmtronx file in-place.
*/
#include <sys/types.h>
@@ -332,7 +332,7 @@ main(int argc, char *argv[])
int i;
if (argc < 2) {
- fprintf(stderr, "usage: sortextable vmlinux...\n");
+ fprintf(stderr, "usage: sortextable vmtronx...\n");
return 0;
}
diff --git a/tkernel_source/security/Makefile b/tkernel_source/security/Makefile
deleted file mode 100644
index d8de23d..0000000
--- a/tkernel_source/security/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += security.o
diff --git a/tkernel_source/security/security.c b/tkernel_source/security/security.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/sound/Makefile b/tkernel_source/sound/Makefile
deleted file mode 100644
index 6e92dfa..0000000
--- a/tkernel_source/sound/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += sound.o
diff --git a/tkernel_source/sound/sound.c b/tkernel_source/sound/sound.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/usr/Makefile b/tkernel_source/usr/Makefile
deleted file mode 100644
index fb408b8..0000000
--- a/tkernel_source/usr/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += usr.o
diff --git a/tkernel_source/usr/usr.c b/tkernel_source/usr/usr.c
deleted file mode 100644
index e69de29..0000000
diff --git a/tkernel_source/virt/Makefile b/tkernel_source/virt/Makefile
deleted file mode 100644
index 3ffb04e..0000000
--- a/tkernel_source/virt/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += virt.o
diff --git a/tkernel_source/virt/virt.c b/tkernel_source/virt/virt.c
deleted file mode 100644
index e69de29..0000000
--
1.9.1
