config: add OBJCOPY build variable to specify command for binary copy…

… operations
nieklinnenbank · Oct 26, 2019 · 5d97d6d · 5d97d6d
1 parent c126d7e
commit 5d97d6d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 6 deletions.
diff --git a/config/arm/raspberry/clang.conf b/config/arm/raspberry/clang.conf
@@ -36,6 +36,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-fuse-ld=bfd' ]
 LINKFLAGS += LINKUSER
 LINKCOM   = '$LINK -o $TARGET $LINKFLAGS -Wl,--start-group -lgcc $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -Wl,--end-group'
 STRIP     = 'strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/arm/raspberry/gcc.conf b/config/arm/raspberry/gcc.conf
@@ -34,6 +34,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-nostartfiles',
               '-nodefaultlibs', '-Wl,--start-group', '-lgcc' ]
 LINKFLAGS += LINKUSER
 STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/arm/raspberry2/clang.conf b/config/arm/raspberry2/clang.conf
@@ -37,6 +37,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-fuse-ld=bfd' ]
 LINKFLAGS += LINKUSER
 LINKCOM   = '$LINK -o $TARGET $LINKFLAGS -Wl,--start-group -lgcc $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -Wl,--end-group'
 STRIP     = 'strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/arm/raspberry2/gcc.conf b/config/arm/raspberry2/gcc.conf
@@ -34,6 +34,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-nostartfiles',
                           '-nodefaultlibs', '-Wl,--start-group', '-lgcc' ]
 LINKFLAGS += LINKUSER
 STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/arm/sunxi-h3/clang.conf b/config/arm/sunxi-h3/clang.conf
@@ -35,7 +35,8 @@ LINKKERN  = [ '-Xlinker', '-T', 'config/arm/sunxi-h3/kernel.ld' ]
 LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-fuse-ld=bfd' ]
 LINKFLAGS += LINKUSER
 LINKCOM   = '$LINK -o $TARGET $LINKFLAGS -Wl,--start-group -lgcc $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -Wl,--end-group'
-STRIP     = 'strip'
+STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/arm/sunxi-h3/gcc.conf b/config/arm/sunxi-h3/gcc.conf
@@ -33,6 +33,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-nostartfiles',
                           '-nodefaultlibs', '-Wl,--start-group', '-lgcc' ]
 LINKFLAGS += LINKUSER
 STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/intel/pc/clang.conf b/config/intel/pc/clang.conf
@@ -34,7 +34,8 @@ LINKKERN  = [ '-Xlinker', '-T', 'config/intel/pc/kernel.ld' ]
 LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-fuse-ld=bfd' ]
 LINKFLAGS += LINKUSER
 LINKCOM   = '$LINK -o $TARGET $LINKFLAGS -Wl,--start-group -lgcc $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS -Wl,--end-group'
-STRIP     = 'strip'
+STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/config/intel/pc/gcc.conf b/config/intel/pc/gcc.conf
@@ -36,6 +36,7 @@ LINKFLAGS = ARCHFLAGS + [ '-static', '-nostdlib', '-nostartfiles',
                           '-nodefaultlibs', '-Wl,--start-group', '-lgcc' ]
 LINKFLAGS += LINKUSER
 STRIP     = '${CROSS_COMPILE}strip'
+OBJCOPY   = '${CROSS_COMPILE}objcopy'
 
 if DEBUG:
    _CCFLAGS += [ '-g3', '-O0' ]

diff --git a/kernel/arm/raspberry/SConscript b/kernel/arm/raspberry/SConscript
@@ -40,14 +40,14 @@ env.TargetProgram('kernel', [ Glob('*.cpp'),
 #
 # Embed the boot.img in the kernel
 #
-env.Command('kernel.bootimg', 'kernel', env['CROSS_COMPILE'] + 'objcopy ' +
+env.Command('kernel.bootimg', 'kernel', env['OBJCOPY'] + ' ' +
             '--update-section .bootimg=' + env['BUILDROOT'] + '/boot.img ' + 
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel')
 
 #
 # Provide binary kernel image to overwrite kernel.img on the Raspbian SD card.
 #
-env.Command('kernel.img', 'kernel.bootimg', env['CROSS_COMPILE'] + 'objcopy -O binary ' +
+env.Command('kernel.img', 'kernel.bootimg', env['OBJCOPY'] + ' -O binary ' +
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel ' +
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel.img')
 

diff --git a/kernel/arm/sunxi-h3/SConscript b/kernel/arm/sunxi-h3/SConscript
@@ -40,14 +40,14 @@ env.TargetProgram('kernel', [ Glob('*.cpp'),
 #
 # Embed the boot.img in the kernel
 #
-env.Command('kernel.bootimg', 'kernel', env['CROSS_COMPILE'] + 'objcopy ' +
+env.Command('kernel.bootimg', 'kernel', env['OBJCOPY'] + ' ' +
             '--update-section .bootimg=' + env['BUILDROOT'] + '/boot.img ' + 
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel')
 
 #
 # Provide binary kernel image to write to the SD card.
 #
-env.Command('kernel.img', 'kernel.bootimg', env['CROSS_COMPILE'] + 'objcopy -O binary ' +
+env.Command('kernel.img', 'kernel.bootimg', env['OBJCOPY'] + ' -O binary ' +
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel ' +
             env['BUILDROOT'] + '/kernel/arm/' + env['SYSTEM'] + '/kernel.img')