Skip to contentSkip to conversation

arch/arm/include/asm/sizes.h: cleanups

PATCH New Andreas Bießmann 2 participants 4 messages Sep 24, 2010 – Oct 12, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch/arm/include/asm/sizes.h: cleanups

Merge several sizes.h in asm/arch subdirectories into a single asm/sizes.h file.

Fixup usage of asm/arch/sizes.h in some files to use the merged file.

---
These changes where submitted in 2008 but never applied. See http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/44229

It is not necessary to have several copies of files with nearly the same content.

 arch/arm/include/asm/arch-arm925t/sizes.h     |   50 ------------------------
 arch/arm/include/asm/arch-arm926ejs/sizes.h   |   51 ------------------------
 arch/arm/include/asm/arch-omap/sizes.h        |   52 -------------------------
 arch/arm/include/asm/arch-omap24xx/omap2420.h |    2 +-
 arch/arm/include/asm/arch-omap24xx/sizes.h    |   49 -----------------------
 arch/arm/include/asm/sizes.h                  |    5 +-
 include/configs/h2_p2_dbg_board.h             |    2 +-
 include/configs/omap1510.h                    |    2 +-
 include/configs/omap730.h                     |    2 +-
 9 files changed, 6 insertions(+), 209 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h
arch/arm/include/asm/arch-arm925t/sizes.h deleted +0 -50
deleted file mode 100644
index 7319bd9..0000000
@@ -1,50 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307	 USA
- */
-/* DO NOT EDIT!! - this file automatically generated
- *		   from .s file by awk -f s2h.awk
- */
-/*  Size defintions
- *  Copyright (C) ARM Limited 1998. All rights reserved.
- */
-
-#ifndef __sizes_h
-#define __sizes_h			1
-
-/* handy sizes */
-#define SZ_1K				0x00000400
-#define SZ_4K				0x00001000
-#define SZ_8K				0x00002000
-#define SZ_16K				0x00004000
-#define SZ_64K				0x00010000
-#define SZ_128K				0x00020000
-#define SZ_256K				0x00040000
-#define SZ_512K				0x00080000
-
-#define SZ_1M				0x00100000
-#define SZ_2M				0x00200000
-#define SZ_4M				0x00400000
-#define SZ_8M				0x00800000
-#define SZ_16M				0x01000000
-#define SZ_32M				0x02000000
-#define SZ_64M				0x04000000
-#define SZ_128M				0x08000000
-#define SZ_256M				0x10000000
-#define SZ_512M				0x20000000
-
-#define SZ_1G				0x40000000
-#define SZ_2G				0x80000000
-
-#endif	/* __sizes_h */
arch/arm/include/asm/arch-arm926ejs/sizes.h deleted +0 -51

51 lines not on this page · raw message

arch/arm/include/asm/arch-omap/sizes.h deleted +0 -52

52 lines not on this page · raw message

arch/arm/include/asm/arch-omap24xx/omap2420.h +1 -1
index 0c11bec..6032419 100644
@@ -25,7 +25,7 @@
 #ifndef _OMAP2420_SYS_H_
 #define _OMAP2420_SYS_H_
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /*
  * 2420 specific Section
arch/arm/include/asm/arch-omap24xx/sizes.h deleted +0 -49

49 lines not on this page · raw message

arch/arm/include/asm/sizes.h +2 -3
index f8d92ca..b0b4f6a 100644
@@ -13,9 +13,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-/* DO NOT EDIT!! - this file automatically generated
- *                 from .s file by awk -f s2h.awk
- */
 /*  Size defintions
  *  Copyright (C) ARM Limited 1998. All rights reserved.
  */
@@ -28,6 +25,7 @@
 #define SZ_4K                           0x00001000
 #define SZ_8K                           0x00002000
 #define SZ_16K                          0x00004000
+#define SZ_32K                          0x00008000
 #define SZ_64K                          0x00010000
 #define SZ_128K                         0x00020000
 #define SZ_256K                         0x00040000
@@ -38,6 +36,7 @@
 #define SZ_4M                           0x00400000
 #define SZ_8M                           0x00800000
 #define SZ_16M                          0x01000000
+#define SZ_31M                          0x01F00000
 #define SZ_32M                          0x02000000
 #define SZ_64M                          0x04000000
 #define SZ_128M                         0x08000000
include/configs/h2_p2_dbg_board.h +1 -1
index e0d823f..a4dea7d 100644
@@ -31,7 +31,7 @@
 #ifndef __INCLUDED_H2_P2_DBH_BOARD_H
 #define __INCLUDED_H2_P2_DBH_BOARD_H
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /*
  * The Debug board is designed to function with the P2 Sample, H2
include/configs/omap1510.h +1 -1
index 931560c..e6d9c7a 100644
@@ -28,7 +28,7 @@
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /*
   There are 2 sets of general I/O -->
include/configs/omap730.h +1 -1
index 04d5144..c7682a1 100644
@@ -31,7 +31,7 @@
 #ifndef __INCLUDED_OMAP730_H
 #define __INCLUDED_OMAP730_H
 
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
 
 /***************************************************************************
  * OMAP730 Configuration Registers
Signature · 1 line
1.7.3
#1 lore raw

PATCH 1/1 arch/arm/include/asm/sizes.h: cleanups

Am 24.09.2010 23:31, schrieb Andreas Bie?mann:

Quoted 6 lines

Merge several sizes.h in asm/arch subdirectories into a single asm/sizes.h file.

Fixup usage of asm/arch/sizes.h in some files to use the merged file.

Any comment on that patch? Should I resend, is any action required from my side?

regards

Andreas Bie?mann

#2 lore raw

PATCH 1/1 arch/arm/include/asm/sizes.h: cleanups

In reply to Andreas Bießmann

Am 24.09.2010 23:31, schrieb Andreas Bie?mann:

Quoted 12 lines

Merge several sizes.h in asm/arch subdirectories into a single asm/sizes.h file.

Fixup usage of asm/arch/sizes.h in some files to use the merged file.

---
These changes where submitted in 2008 but never applied. See http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/44229

It is not necessary to have several copies of files with nearly the same content.

Quoted 15 lines
 arch/arm/include/asm/arch-arm925t/sizes.h     |   50 ------------------------
 arch/arm/include/asm/arch-arm926ejs/sizes.h   |   51 ------------------------
 arch/arm/include/asm/arch-omap/sizes.h        |   52 -------------------------
 arch/arm/include/asm/arch-omap24xx/omap2420.h |    2 +-
 arch/arm/include/asm/arch-omap24xx/sizes.h    |   49 -----------------------
 arch/arm/include/asm/sizes.h                  |    5 +-
 include/configs/h2_p2_dbg_board.h             |    2 +-
 include/configs/omap1510.h                    |    2 +-
 include/configs/omap730.h                     |    2 +-
 9 files changed, 6 insertions(+), 209 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h

Any comment on that patch? Is any action from my side required?

I'd only get attraction on this patch cause some changes needed for my at91rm9200ek transition to new at91 code which will arrive in some days.

regards

Andreas Bie?mann

#3 lore raw

PATCH 1/1 arch/arm/include/asm/sizes.h: cleanups

In reply to Andreas Bießmann

Dear =?UTF-8?q?Andreas=20Bie=C3=9Fmann?=,

Quoted 13 lines · In message <[email protected]>…

Merge several sizes.h in asm/arch subdirectories into a single asm/sizes.h file.

Fixup usage of asm/arch/sizes.h in some files to use the merged file.

---
These changes where submitted in 2008 but never applied. See http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/44229

It is not necessary to have several copies of files with nearly the same content.

Quoted 14 lines
 arch/arm/include/asm/arch-arm925t/sizes.h     |   50 ------------------------
 arch/arm/include/asm/arch-arm926ejs/sizes.h   |   51 ------------------------
 arch/arm/include/asm/arch-omap/sizes.h        |   52 -------------------------
 arch/arm/include/asm/arch-omap24xx/omap2420.h |    2 +-
 arch/arm/include/asm/arch-omap24xx/sizes.h    |   49 -----------------------
 arch/arm/include/asm/sizes.h                  |    5 +-
 include/configs/h2_p2_dbg_board.h             |    2 +-
 include/configs/omap1510.h                    |    2 +-
 include/configs/omap730.h                     |    2 +-
 9 files changed, 6 insertions(+), 209 deletions(-)
 delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h
 delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h

Applied to u-boot-arm, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
When properly administered, vacations do not  diminish  productivity:
for every week you're away and get nothing done, there's another when
your boss is away and you get twice as much done.  -- Daniel B. Luten