mirror of
https://github.com/drasko/codezero.git
synced 2026-01-12 02:43:15 +01:00
Added separate toolchains for userspace and kernel.
This commit is contained in:
@@ -64,7 +64,7 @@ class AtagsBuilder:
|
||||
with open(self.atags_h_in, 'r') as input:
|
||||
output.write(input.read() % {'cn' : self.cont_id})
|
||||
|
||||
os.system(config.toolchain + "cpp -I%s -P %s > %s" % \
|
||||
os.system(config.toolchain_userspace + "cpp -I%s -P %s > %s" % \
|
||||
(self.LINUX_ATAGS_BUILDDIR, self.atags_lds_in, \
|
||||
self.atags_lds_out))
|
||||
|
||||
@@ -72,7 +72,7 @@ class AtagsBuilder:
|
||||
with open(self.atags_c_in, 'r') as input:
|
||||
output.write(input.read() % {'cn' : self.cont_id})
|
||||
|
||||
os.system(config.toolchain + "gcc " + \
|
||||
os.system(config.toolchain_userspace + "gcc " + \
|
||||
"-g -ffreestanding -std=gnu99 -Wall -Werror " + \
|
||||
"-nostdlib -o %s -T%s %s" % \
|
||||
(self.atags_elf_out, self.atags_lds_out, self.atags_c_out))
|
||||
|
||||
@@ -189,20 +189,22 @@ class LinuxBuilder:
|
||||
for platform, config_file in self.platform_config_file:
|
||||
if platform == config.platform.upper():
|
||||
configuration_file = config_file
|
||||
os.system("make ARCH=codezero CROSS_COMPILE=" + config.toolchain + \
|
||||
os.system("make ARCH=codezero CROSS_COMPILE=" + \
|
||||
config.toolchain_userspace + \
|
||||
" O=" + self.LINUX_KERNEL_BUILDDIR + " " + configuration_file)
|
||||
|
||||
self.kernel_updater.modify_kernel_config(self.LINUX_KERNEL_BUILDDIR)
|
||||
self.kernel_updater.update_kernel_params(config, self.container)
|
||||
|
||||
os.system("make ARCH=codezero CROSS_COMPILE=" + config.toolchain + \
|
||||
os.system("make ARCH=codezero CROSS_COMPILE=" + \
|
||||
config.toolchain_userspace + \
|
||||
" O=" + self.LINUX_KERNEL_BUILDDIR + " menuconfig")
|
||||
os.system("make ARCH=codezero " + \
|
||||
"CROSS_COMPILE=" + config.toolchain + " O=" + \
|
||||
self.LINUX_KERNEL_BUILDDIR)
|
||||
"CROSS_COMPILE=" + config.toolchain_userspace + \
|
||||
" O=" + self.LINUX_KERNEL_BUILDDIR)
|
||||
|
||||
# Generate kernel_image, elf to be used by codezero
|
||||
linux_elf_gen_cmd = (config.toolchain + "objcopy -R .note \
|
||||
linux_elf_gen_cmd = (config.toolchain_userspace + "objcopy -R .note \
|
||||
-R .note.gnu.build-id -R .comment -S --change-addresses " + \
|
||||
str(conv_hex(-self.container.linux_page_offset + self.container.linux_phys_offset)) + \
|
||||
" " + self.kernel_binary_image + " " + self.kernel_image)
|
||||
|
||||
@@ -51,10 +51,10 @@ class RootfsBuilder:
|
||||
with open(self.rootfs_h_in, 'r') as input:
|
||||
output.write(input.read() % {'cn' : self.cont_id})
|
||||
|
||||
os.system(config.toolchain + "cpp -I%s -P %s > %s" % \
|
||||
os.system(config.toolchain_userspace + "cpp -I%s -P %s > %s" % \
|
||||
(self.LINUX_ROOTFS_BUILDDIR, self.rootfs_lds_in, \
|
||||
self.rootfs_lds_out))
|
||||
os.system(config.toolchain + "gcc " + \
|
||||
os.system(config.toolchain_userspace + "gcc " + \
|
||||
"-nostdlib -o %s -T%s rootfs.S" % (self.rootfs_elf_out, \
|
||||
self.rootfs_lds_out))
|
||||
print "Done..."
|
||||
|
||||
Reference in New Issue
Block a user