diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/bfin/Makefile | 53 | ||||
| -rw-r--r-- | target/bfin/kernel/sim-bfin | 6 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.kernel | 4 |
4 files changed, 62 insertions, 2 deletions
diff --git a/target/bfin/Makefile b/target/bfin/Makefile index a000c0f1b..5db509c5c 100644 --- a/target/bfin/Makefile +++ b/target/bfin/Makefile @@ -5,5 +5,56 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk -KERNEL:=$(LINUX_DIR)/arch/bfin/boot/uImage +KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) +# target helper text +ifeq ($(ADK_TARGET_FS),archive) +targethelp: + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" +endif +ifeq ($(ADK_TARGET_FS),initramfs) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' +endif +ifeq ($(ADK_TARGET_FS),initramfsarchive) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" +endif +ifeq ($(ADK_TARGET_FS),initramfspiggyback) +targethelp: + @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' +ifeq ($(ADK_TARGET_SIM),y) + @echo "Run the simulator via:" + @echo '$(TARGET_CROSS)run --env operating --model bf512 $(FW_DIR)/$(TARGET_KERNEL)' +endif +endif +ifeq ($(ADK_TARGET_FS),nfsroot) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" +endif + +kernel-strip: + @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) + +kernel-install: kernel-strip + @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) + +# filesystem specific targets +ifeq ($(ADK_TARGET_FS),archive) +imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp +endif +ifeq ($(ADK_TARGET_FS),initramfs) +imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp +endif +ifeq ($(ADK_TARGET_FS),initramfsarchive) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif +ifeq ($(ADK_TARGET_FS),initramfspiggyback) +imageinstall: createinitramfs targethelp +endif +ifeq ($(ADK_TARGET_FS),nfsroot) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif diff --git a/target/bfin/kernel/sim-bfin b/target/bfin/kernel/sim-bfin index b0cbf7edb..a4a0b9b00 100644 --- a/target/bfin/kernel/sim-bfin +++ b/target/bfin/kernel/sim-bfin @@ -1,3 +1,7 @@ CONFIG_BLACKFIN=y -CONFIG_BF542_std=y +CONFIG_BF512=y CONFIG_ICACHE_FLUSH_L1=y +CONFIG_SERIAL_BFIN=y +CONFIG_SERIAL_BFIN_CONSOLE=y +CONFIG_SERIAL_BFIN_UART0=y +CONFIG_SERIAL_BFIN_UART1=y diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 039c38a43..51454767f 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -231,6 +231,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE || ADK_TARGET_QEMU \ || ADK_TARGET_SIM default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64 + default "ttyBF0" if ADK_TARGET_ARCH_BFIN default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 default "ttyARC0" if ADK_TARGET_SYSTEM_NSIM_ARCV1 \ || ADK_TARGET_SYSTEM_NSIM_ARCV2 diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index b53df07bf..36e338861 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -204,6 +204,10 @@ config ADK_KERNEL_UEVENT_HELPER_PATH default "/sbin/mdev" depends on ADK_RUNTIME_DEV_MDEV +config ADK_KERNEL_BINFMT_ELF_FDPIC + bool + default y if ADK_TARGET_BINFMT_FDPIC + config ADK_KERNEL_BINFMT_FLAT bool default y if ADK_TARGET_BINFMT_FLAT |