Skip to contentSkip to conversation

hummingboard: Remove mx6solo specific support

PATCH New Fabio Estevam 3 participants 6 messages May 11, 2015 – May 15, 2015 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 hummingboard: Remove mx6solo specific support

Hummingboard dual, dual-lite and solo are now supported via SPL mechanism.

Remove the previous hummingboard support, which does not use SPL and supported only the solo variant.

---
Changes since v1:
- Also remove the mx6-microsom directory

 arch/arm/Kconfig                                   |   5 -
 board/solidrun/hummingboard/Kconfig                |  15 --
 board/solidrun/hummingboard/MAINTAINERS            |   6 -
 board/solidrun/hummingboard/Makefile               |   9 -
 board/solidrun/hummingboard/README                 |  40 ----
 board/solidrun/hummingboard/hummingboard.c         | 182 -----------------
 board/solidrun/hummingboard/solo.cfg               |  25 ---
 board/solidrun/mx6-microsom/800mhz_2x128mx16.cfg   |  74 -------
 board/solidrun/mx6-microsom/clocks.cfg             |  33 ---
 .../mx6-microsom/ddr-800mhz-32bit-setup.cfg        |  76 -------
 configs/hummingboard_solo_defconfig                |   3 -
 include/configs/hummingboard.h                     | 224 ---------------------
 12 files changed, 692 deletions(-)
 delete mode 100644 board/solidrun/hummingboard/Kconfig
 delete mode 100644 board/solidrun/hummingboard/MAINTAINERS
 delete mode 100644 board/solidrun/hummingboard/Makefile
 delete mode 100644 board/solidrun/hummingboard/README
 delete mode 100644 board/solidrun/hummingboard/hummingboard.c
 delete mode 100644 board/solidrun/hummingboard/solo.cfg
 delete mode 100644 board/solidrun/mx6-microsom/800mhz_2x128mx16.cfg
 delete mode 100644 board/solidrun/mx6-microsom/clocks.cfg
 delete mode 100644 board/solidrun/mx6-microsom/ddr-800mhz-32bit-setup.cfg
 delete mode 100644 configs/hummingboard_solo_defconfig
 delete mode 100644 include/configs/hummingboard.h
arch/arm/Kconfig +0 -5
index 00be305..2192197 100644
@@ -556,10 +556,6 @@ config TARGET_GW_VENTANA
 	select CPU_V7
 	select SUPPORT_SPL
 
-config TARGET_HUMMINGBOARD
-	bool "Support hummingboard"
-	select CPU_V7
-
 config TARGET_KOSAGI_NOVENA
 	bool "Support Kosagi Novena"
 	select CPU_V7
@@ -928,7 +924,6 @@ source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
 source "board/silica/pengwyn/Kconfig"
 source "board/solidrun/mx6cuboxi/Kconfig"
-source "board/solidrun/hummingboard/Kconfig"
 source "board/spear/spear300/Kconfig"
 source "board/spear/spear310/Kconfig"
 source "board/spear/spear320/Kconfig"
board/solidrun/hummingboard/Kconfig deleted +0 -15
deleted file mode 100644
index 36b7904..0000000
@@ -1,15 +0,0 @@
-if TARGET_HUMMINGBOARD
-
-config SYS_BOARD
-	default "hummingboard"
-
-config SYS_VENDOR
-	default "solidrun"
-
-config SYS_SOC
-	default "mx6"
-
-config SYS_CONFIG_NAME
-	default "hummingboard"
-
-endif
board/solidrun/hummingboard/MAINTAINERS deleted +0 -6
deleted file mode 100644
index c0c062a..0000000
@@ -1,6 +0,0 @@
-HUMMINGBOARD BOARD
-M:	Jon Nettleton <[email protected]>
-S:	Maintained
-F:	board/solidrun/hummingboard/
-F:	include/configs/hummingboard.h
-F:	configs/hummingboard_solo_defconfig
board/solidrun/hummingboard/Makefile deleted +0 -9
deleted file mode 100644
index 042a2f0..0000000
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2013 Freescale Semiconductor, Inc.
-# Copyright (C) 2013, Boundary Devices <[email protected]>
-# Copyright (C) 2013, Jon Nettleton <[email protected]>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y  := hummingboard.o
board/solidrun/hummingboard/README deleted +0 -40
deleted file mode 100644
index cfd62d4..0000000
@@ -1,40 +0,0 @@
-U-Boot for SolidRun Hummingboard
---------------------------------
-
-This file contains information for the port of U-Boot to the Hummingboard.
-
-For more details about Hummingboard, please refer to:
-http://imx.solid-run.com/wiki/index.php?title=Carrier-One_Hardware
-
-(Carrier-One was the previous name of Hummingboard).
-
-Building U-boot for Hummingboard
---------------------------------
-
-To build U-Boot for the Hummingboard Solo version:
-
-$ make hummingboard_solo_config
-$ make
-
-Flashing U-boot into the SD card
---------------------------------
-
-- After the 'make' command completes, the generated 'u-boot.imx' binary must be
-flashed into the SD card:
-
-$ sudo dd if=u-boot.imx of=/dev/mmcblk0 bs=1k seek=1; sync
-
-(Note - the SD card node may vary, so adjust this as needed).
-
-Also, a more detailed explanation on how to format the SD card is available
-at doc/README.imximage.
-
-- Insert the micro SD card into the slot located in the bottom of the board
-
-- Connect a 3.3V USB to serial converter cable to the host PC. The MX6 UART
-signals are available in the 26 pin connector as shown at:
-http://imx.solid-run.com/wiki/index.php?title=Carrier-One_Hardware
-(Check for "26 pin header layout").
-
-- Power up the board via USB cable (CON201) and U-boot messages will appear in
-the serial console.
board/solidrun/hummingboard/hummingboard.c deleted +0 -182

182 lines not on this page · raw message

board/solidrun/hummingboard/solo.cfg deleted +0 -25
deleted file mode 100644
index 28dd750..0000000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2013 Boundary Devices
- * Copyright (C) 2013 Jon Nettleton <[email protected]>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/* image version */
-IMAGE_VERSION 2
-
-/*
- * Boot Device : one of
- * spi, sd (the board has no nand neither onenand)
- */
-BOOT_FROM      sd
-
-#define __ASSEMBLY__
-#include <config.h>
-#include "asm/arch/mx6-ddr.h"
-#include "asm/arch/iomux.h"
-#include "asm/arch/crm_regs.h"
-
-#include "../mx6-microsom/ddr-800mhz-32bit-setup.cfg"
-#include "../mx6-microsom/800mhz_2x128mx16.cfg"
-#include "../mx6-microsom/clocks.cfg"
board/solidrun/mx6-microsom/800mhz_2x128mx16.cfg deleted +0 -74

74 lines not on this page · raw message

board/solidrun/mx6-microsom/clocks.cfg deleted +0 -33
deleted file mode 100644
index 1288811..0000000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 Boundary Devices
- * Copyright (C) 2013 SolidRun ltd.
- * Copyright (C) 2013 Jon Nettleton <[email protected]>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/* set the default clock gate to save power */
-DATA 4, CCM_CCGR0, 0x00C03F3F
-DATA 4, CCM_CCGR1, 0x0030FC03
-DATA 4, CCM_CCGR2, 0x0FFFC000
-DATA 4, CCM_CCGR3, 0x3FF00000
-DATA 4, CCM_CCGR4, 0x00FFF300
-DATA 4, CCM_CCGR5, 0x0F0000C3
-DATA 4, CCM_CCGR6, 0x000003FF
-
-/* enable AXI cache for VDOA/VPU/IPU */
-DATA 4, MX6_IOMUXC_GPR4, 0xF00000CF
-/* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-DATA 4, MX6_IOMUXC_GPR6, 0x007F007F
-DATA 4, MX6_IOMUXC_GPR7, 0x007F007F
-
-/*
- * Setup CCM_CCOSR register as follows:
- *
- * cko1_en  = 1    --> CKO1 enabled
- * cko1_div = 111  --> divide by 8
- * cko1_sel = 1011 --> ahb_clk_root
- *
- * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
- */
-DATA 4, CCM_CCOSR, 0x000000fb
board/solidrun/mx6-microsom/ddr-800mhz-32bit-setup.cfg deleted +0 -76

76 lines not on this page · raw message

configs/hummingboard_solo_defconfig deleted +0 -3
deleted file mode 100644
index 600fa00..0000000
@@ -1,3 +0,0 @@
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/hummingboard/solo.cfg,MX6S,DDR_MB=512"
-CONFIG_ARM=y
-CONFIG_TARGET_HUMMINGBOARD=y
include/configs/hummingboard.h deleted +0 -224

224 lines not on this page · raw message

Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 2/2 mx6cuboxi: Mention Cubox-i in the README

Cubox-i boards are also supported, so update the README file.

---
Changes since v1:
- None

 board/solidrun/mx6cuboxi/README | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
board/solidrun/mx6cuboxi/README +5 -5
index 3050c48..b417ff0 100644
@@ -1,7 +1,7 @@
-How to use U-boot on Solid-run mx6 hummingboard
------------------------------------------------
+How to use U-boot on Solid-run mx6 Hummingboard and Cubox-i
+-----------------------------------------------------------
 
-- Build U-boot for hummingboard:
+- Build U-boot for Hummingboard/Cubox-i:
 
 $ make mrproper
 $ make mx6cuboxi_defconfig
@@ -17,5 +17,5 @@ sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync
 
 sudo dd if=u-boot.img of=/dev/mmcblk0 bs=1k seek=69; sync
 
-- Insert the SD card in the hummingboard, power it up and U-boot messages
-should come up.
+- Insert the SD card in the board, power it up and U-boot messages should
+come up.
Signature · 1 line
1.9.1
#2 lore raw

PATCH v2 2/2 mx6cuboxi: Mention Cubox-i in the README

Quoted 4 lines · Fabio Estevam

Cubox-i boards are also supported, so update the README file.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH v2 1/2 hummingboard: Remove mx6solo specific support

In reply to Fabio Estevam

Hi Fabio,

Quoted 7 lines · Fabio Estevam

Hummingboard dual, dual-lite and solo are now supported via SPL mechanism.

Remove the previous hummingboard support, which does not use SPL and supported only the solo variant.

---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#4 lore raw

PATCH v2 1/2 hummingboard: Remove mx6solo specific support

Hi Stefano,

Quoted 5 lines · Stefano Babic

Hi Fabio,

Quoted 2 lines · Fabio Estevam

Hummingboard dual, dual-lite and solo are now supported via SPL mechanism.

Quoted 7 lines
Quoted 5 lines

Remove the previous hummingboard support, which does not use SPL and supported only the solo variant.

---

Applied to u-boot-imx, thanks !

Looking at u-boot-imx I think you have applied v1 instead of v2.

Would you like me to send a patch removing the remaining mx6-microsom directory?

Regards,

Fabio Estevam

#5 lore raw

PATCH v2 1/2 hummingboard: Remove mx6solo specific support

Hi Fabio,

Quoted 11 lines · Fabio Estevam

Hi Stefano,

Quoted 8 lines · Stefano Babic

Hi Fabio,

Quoted 5 lines · Fabio Estevam

Hummingboard dual, dual-lite and solo are now supported via SPL mechanism.

Remove the previous hummingboard support, which does not use SPL and supported only the solo variant.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

---

Applied to u-boot-imx, thanks !

Looking at u-boot-imx I think you have applied v1 instead of v2.

Sorry for that !

Quoted 2 lines

Would you like me to send a patch removing the remaining mx6-microsom directory?

Yes, thanks.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================