qemu/mips: arrange for vmlinux to be bootable
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
parent
ae6c323a0b
commit
d39ae18df2
|
@ -68,13 +68,15 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
|
||||||
# We don't want to override kernel Makefile variables from the environment
|
# We don't want to override kernel Makefile variables from the environment
|
||||||
EXTRA_OEMAKE = ""
|
EXTRA_OEMAKE = ""
|
||||||
|
|
||||||
|
KERNEL_ALT_IMAGETYPE ??= ""
|
||||||
|
|
||||||
kernel_do_compile() {
|
kernel_do_compile() {
|
||||||
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
|
||||||
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
|
if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
|
||||||
oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
fi
|
fi
|
||||||
oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
oe_runmake ${KERNEL_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
|
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
|
||||||
oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}"
|
||||||
else
|
else
|
||||||
|
|
|
@ -7,7 +7,8 @@ TARGET_ARCH = "mips"
|
||||||
require conf/machine/include/qemu.inc
|
require conf/machine/include/qemu.inc
|
||||||
require conf/machine/include/tune-mips32.inc
|
require conf/machine/include/tune-mips32.inc
|
||||||
|
|
||||||
KERNEL_IMAGETYPE = "vmlinux.bin"
|
KERNEL_IMAGETYPE = "vmlinux"
|
||||||
|
KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
|
||||||
|
|
||||||
SERIAL_CONSOLE = "115200 ttyS0"
|
SERIAL_CONSOLE = "115200 ttyS0"
|
||||||
|
|
||||||
|
|
|
@ -63,10 +63,8 @@ do_wrlinux_configcheck() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_link_vmlinux() {
|
do_wrlinux_link_vmlinux() {
|
||||||
if [ -n "${KERNEL_IMAGETYPE_LINK}" ]; then
|
cd ${B}/arch/${ARCH}/boot
|
||||||
cd ${B}/arch/${ARCH}/boot
|
ln -sf ../../../vmlinux
|
||||||
ln -sf ../../../${KERNEL_IMAGETYPE_LINK}
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_wrlinux_configme[depends] = "kern-tools-native:do_populate_sysroot"
|
do_wrlinux_configme[depends] = "kern-tools-native:do_populate_sysroot"
|
||||||
|
|
|
@ -104,7 +104,7 @@ fi
|
||||||
|
|
||||||
if [ "$MACHINE" = "qemumips" ]; then
|
if [ "$MACHINE" = "qemumips" ]; then
|
||||||
if [ "x$ZIMAGE" = "x" ]; then
|
if [ "x$ZIMAGE" = "x" ]; then
|
||||||
ZIMAGE=$BUILDDIR/tmp/deploy/images/vmlinux.bin-$MACHINE.bin
|
ZIMAGE=$BUILDDIR/tmp/deploy/images/vmlinux-$MACHINE.bin
|
||||||
fi
|
fi
|
||||||
if [ "$TYPE" = "ext3" ]; then
|
if [ "$TYPE" = "ext3" ]; then
|
||||||
if [ "x$HDIMAGE" = "x" ]; then
|
if [ "x$HDIMAGE" = "x" ]; then
|
||||||
|
|
Loading…
Reference in New Issue