diff options
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 23 | ||||
| -rw-r--r-- | target/arm/kernel/hummingboard | 18 | ||||
| -rw-r--r-- | target/arm/kernel/solidrun-imx6 (renamed from target/arm/kernel/cubox-i) | 0 | ||||
| -rw-r--r-- | target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch (renamed from target/arm/cubox-i/patches/3.14.15/solidrun.patch) | 0 | ||||
| -rw-r--r-- | target/arm/solidrun-imx6/patches/3.16.1/rmk-wifi.patch (renamed from target/arm/cubox-i/patches/3.16.1/rmk-wifi.patch) | 0 | ||||
| -rw-r--r-- | target/arm/systems/cubox-i | 28 | ||||
| -rw-r--r-- | target/arm/systems/solidrun-imx6 (renamed from target/arm/systems/hummingboard) | 12 |
7 files changed, 11 insertions, 70 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 4a87bc6ec..b216f1104 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -49,14 +49,9 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install with a writable data partition" @echo "sudo ./scripts/install-rpi.sh -d /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)" endif -ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y) +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) @echo "Use following command to install it on SD card:" - @echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)" - -endif -ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y) - @echo "Use following command to install it on SD card:" - @echo "sudo ./scripts/install-cubox.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)" + @echo "sudo ./scripts/install-solidrun.sh /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL) $(FW_DIR)" endif endif @@ -90,22 +85,16 @@ kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) dtb-install: -ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y) - env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ - -j${ADK_MAKE_JOBS} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb $(MAKE_TRACE) - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-cubox-i.dtb \ - $(FW_DIR) -endif -ifeq ($(ADK_TARGET_SYSTEM_HUMMINGBOARD),y) +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ - -j${ADK_MAKE_JOBS} imx6dl-hummingboard.dtb $(MAKE_TRACE) - $(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*-hummingboard.dtb \ + imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb $(MAKE_TRACE) + $(CP) $(LINUX_DIR)/arch/arm/boot/dts/imx6*.dtb \ $(FW_DIR) endif # filesystem specific targets ifeq ($(ADK_TARGET_FS),archive) -ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I)$(ADK_TARGET_SYSTEM_HUMMINGBOARD),y) +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) imageinstall: dtb-install $(FW_DIR)/$(ROOTFSTARBALL) targethelp else imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp diff --git a/target/arm/kernel/hummingboard b/target/arm/kernel/hummingboard deleted file mode 100644 index 97e6393ef..000000000 --- a/target/arm/kernel/hummingboard +++ /dev/null @@ -1,18 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MXC=y -CONFIG_ARCH_MX6=y -CONFIG_SOC_IMX6Q=y -CONFIG_SOC_IMX6SL=y -CONFIG_LOCAL_TIMERS=y -CONFIG_MXC_DEBUG_BOARD=y -CONFIG_KUSER_HELPERS=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_PCI_IMX6=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_ATAGS=y -CONFIG_CMDLINE_FORCE=y diff --git a/target/arm/kernel/cubox-i b/target/arm/kernel/solidrun-imx6 index 97e6393ef..97e6393ef 100644 --- a/target/arm/kernel/cubox-i +++ b/target/arm/kernel/solidrun-imx6 diff --git a/target/arm/cubox-i/patches/3.14.15/solidrun.patch b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch index ac5ee0237..ac5ee0237 100644 --- a/target/arm/cubox-i/patches/3.14.15/solidrun.patch +++ b/target/arm/solidrun-imx6/patches/3.14.15/solidrun.patch diff --git a/target/arm/cubox-i/patches/3.16.1/rmk-wifi.patch b/target/arm/solidrun-imx6/patches/3.16.1/rmk-wifi.patch index 0ba3a7951..0ba3a7951 100644 --- a/target/arm/cubox-i/patches/3.16.1/rmk-wifi.patch +++ b/target/arm/solidrun-imx6/patches/3.16.1/rmk-wifi.patch diff --git a/target/arm/systems/cubox-i b/target/arm/systems/cubox-i deleted file mode 100644 index 1d96e8cfc..000000000 --- a/target/arm/systems/cubox-i +++ /dev/null @@ -1,28 +0,0 @@ -config ADK_TARGET_SYSTEM_CUBOX_I - bool "Cubox-i" - select ADK_arm - select ADK_little - select ADK_eabihf - select ADK_fpu_neon - select ADK_cubox_i - select ADK_CPU_CORTEX_A9 - select ADK_TARGET_CPU_WITH_FPU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_CPU_FREQ - select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_SD - select ADK_TARGET_WITH_I2C - select ADK_TARGET_WITH_SPI - select ADK_TARGET_WITH_RTC - select ADK_TARGET_WITH_SDIO - select ADK_TARGET_WITH_SOUND - select ADK_TARGET_WITH_LEDS - select ADK_TARGET_WITH_SMP - select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_WIFI - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_WITH_ROOT_RW - select ADK_PACKAGE_U_BOOT_IMX6 - help - Solidrun Cubox-i - diff --git a/target/arm/systems/hummingboard b/target/arm/systems/solidrun-imx6 index 4688a6f41..38e80e70f 100644 --- a/target/arm/systems/hummingboard +++ b/target/arm/systems/solidrun-imx6 @@ -1,10 +1,10 @@ -config ADK_TARGET_SYSTEM_HUMMINGBOARD - bool "HummingBoard" +config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + bool "Solidrun IMX6 Embedded Systems" select ADK_arm select ADK_little select ADK_eabihf select ADK_fpu_neon - select ADK_hummingboard + select ADK_solidrun_imx6 select ADK_CPU_CORTEX_A9 select ADK_TARGET_CPU_WITH_FPU select ADK_TARGET_WITH_VGA @@ -13,15 +13,13 @@ config ADK_TARGET_SYSTEM_HUMMINGBOARD select ADK_TARGET_WITH_SD select ADK_TARGET_WITH_I2C select ADK_TARGET_WITH_SPI - select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_SOUND select ADK_TARGET_WITH_LEDS - select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_WATCHDOG - select ADK_TARGET_WITH_WIFI select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_WITH_ROOT_RW select ADK_PACKAGE_U_BOOT_IMX6 help - Solidrun HummingBoard + Solidrun IMX6 Embedded Systems. + http://www.solid-run.com |