Skip to contentSkip to conversation

mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

PATCH New Fabio Estevam 3 participants 4 messages Jul 26, 2013 – Jul 27, 2013

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH v3 1/1 mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

From: Fabio Estevam <[email protected]>

mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier.

Tested booting a mainline device tree kernel on a mx6qsabrelite board.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v2:
- Rebased against u-boot-imx
Changes since v1:
- Update MAINTAINERS file

 MAINTAINERS                                    |   2 +-
 board/boundary/nitrogen6x/README.mx6qsabrelite |  72 +++
 board/freescale/mx6qsabrelite/Makefile         |  41 --
 board/freescale/mx6qsabrelite/README           |  72 ---
 board/freescale/mx6qsabrelite/mx6qsabrelite.c  | 848 -------------------------
 boards.cfg                                     |   2 +-
 include/configs/mx6qsabrelite.h                | 297 ---------
 include/configs/nitrogen6x.h                   |  80 ++-
 8 files changed, 153 insertions(+), 1261 deletions(-)
 create mode 100644 board/boundary/nitrogen6x/README.mx6qsabrelite
 delete mode 100644 board/freescale/mx6qsabrelite/Makefile
 delete mode 100644 board/freescale/mx6qsabrelite/README
 delete mode 100644 board/freescale/mx6qsabrelite/mx6qsabrelite.c
 delete mode 100644 include/configs/mx6qsabrelite.h
MAINTAINERS +1 -1
index 081cf96..0a900dc 100644
@@ -601,7 +601,6 @@ Jason Liu <[email protected]>
 	mx53evk         i.MX53
 	mx53loco        i.MX53
 	mx6qarm2	i.MX6Q
-	mx6qsabrelite   i.MX6Q
 
 Enric Balletbo i Serra <[email protected]>
 

@@ -1067,6 +1066,7 @@ Pali Roh?r <[email protected]>
 	nokia_rx51	ARM ARMV7 (OMAP34xx SoC)
 
 Eric Nelson <[email protected]>
+	mx6qsabrelite		i.MX6Q		1GB
 	nitrogen6dl		i.MX6DL		1GB
 	nitrogen6dl2g		i.MX6DL		2GB
 	nitrogen6q		i.MX6Q/6D	1GB
board/boundary/nitrogen6x/README.mx6qsabrelite new file +72 -0

72 lines not on this page · raw message

board/freescale/mx6qsabrelite/Makefile deleted +0 -41

41 lines not on this page · raw message

board/freescale/mx6qsabrelite/README deleted +0 -72

72 lines not on this page · raw message

board/freescale/mx6qsabrelite/mx6qsabrelite.c deleted +0 -848

848 lines not on this page · raw message

boards.cfg +1 -1
index 6a368de..f919c53 100644
@@ -268,7 +268,7 @@ vision2                      arm         armv7       vision2             ttcontr
 cgtqmx6qeval				 arm		 armv7		 cgtqmx6eval		 congatec		mx6		cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
 mx6qarm2                     arm         armv7       mx6qarm2            freescale      mx6		mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg
 mx6qsabreauto                arm         armv7       mx6qsabreauto       freescale      mx6		mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q
-mx6qsabrelite                arm         armv7       mx6qsabrelite       freescale      mx6		mx6qsabrelite:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+mx6qsabrelite                arm         armv7       nitrogen6x          boundary       mx6		nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE
 mx6dlsabresd                 arm         armv7       mx6sabresd          freescale      mx6		mx6sabresd:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL
 mx6qsabresd                  arm         armv7       mx6sabresd          freescale      mx6		mx6sabresd:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q
 mx6slevk                     arm         armv7       mx6slevk            freescale      mx6		mx6slevk:IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL
include/configs/mx6qsabrelite.h deleted +0 -297

297 lines not on this page · raw message

include/configs/nitrogen6x.h +79 -1

99 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v3 1/1 mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

Hi Fabio,

Quoted 10 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier.

Tested booting a mainline device tree kernel on a mx6qsabrelite board.

Signed-off-by Fabio Estevam <[email protected]>

---

Thanks, no corruption at all - and as the new version differs only for the mail format, there is no need to wait for inclusion.

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================
#2 lore raw

PATCH v3 1/1 mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

Thanks Stefano,

Quoted 11 lines · Stefano Babic

Hi Fabio,

Quoted 8 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the code duplication and only use the nitrogen6x source code to make board code maintainance easier.

Tested booting a mainline device tree kernel on a mx6qsabrelite board.

Quoted 8 lines
Quoted 2 lines
Signed-off-by Fabio Estevam <[email protected]>

---

Thanks, no corruption at all - and as the new version differs only for the mail format, there is no need to wait for inclusion.

Applied to u-boot-imx, thanks !

Do we now need updated patches from Pardeep and Robert, who have patches pending that include changes to board/freescale/mx6qsabrelite/?

Please advise,

Eric

#3 lore raw

PATCH v3 1/1 mx6qsabrelite: Remove mx6qsabrelite code in favor of nitrogen6x

Hi Eric,

Quoted 19 lines · Eric Nelson

Thanks Stefano,

Quoted 16 lines · Stefano Babic

Hi Fabio,

Quoted 12 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

mx6qsabrelite and nitrogen6q boards are hardware compatible, so let's avoid the
code duplication and only use the nitrogen6x source code to make board code
maintainance easier.

Tested booting a mainline device tree kernel on a mx6qsabrelite board.

Signed-off-by Fabio Estevam <[email protected]>

---

Quoted 8 lines
Quoted 5 lines

Thanks, no corruption at all - and as the new version differs only for the mail format, there is no need to wait for inclusion.

Applied to u-boot-imx, thanks !

Do we now need updated patches from Pardeep and Robert, who have patches pending that include changes to board/freescale/mx6qsabrelite/?

No need - I fixed it myself and applied.

Regards,
Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================