* [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups
@ 2010-09-24 21:31 Andreas Bießmann
2010-10-08 10:40 ` Andreas Bießmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andreas Bießmann @ 2010-09-24 21:31 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
---
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
diff --git a/arch/arm/include/asm/arch-arm925t/sizes.h b/arch/arm/include/asm/arch-arm925t/sizes.h
deleted file mode 100644
index 7319bd9..0000000
--- a/arch/arm/include/asm/arch-arm925t/sizes.h
+++ /dev/null
@@ -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 */
diff --git a/arch/arm/include/asm/arch-arm926ejs/sizes.h b/arch/arm/include/asm/arch-arm926ejs/sizes.h
deleted file mode 100644
index ef0b99b..0000000
--- a/arch/arm/include/asm/arch-arm926ejs/sizes.h
+++ /dev/null
@@ -1,51 +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, MA0 2111-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 */
diff --git a/arch/arm/include/asm/arch-omap/sizes.h b/arch/arm/include/asm/arch-omap/sizes.h
deleted file mode 100644
index f8d92ca..0000000
--- a/arch/arm/include/asm/arch-omap/sizes.h
+++ /dev/null
@@ -1,52 +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
-
-/* END */
diff --git a/arch/arm/include/asm/arch-omap24xx/omap2420.h b/arch/arm/include/asm/arch-omap24xx/omap2420.h
index 0c11bec..6032419 100644
--- a/arch/arm/include/asm/arch-omap24xx/omap2420.h
+++ b/arch/arm/include/asm/arch-omap24xx/omap2420.h
@@ -25,7 +25,7 @@
#ifndef _OMAP2420_SYS_H_
#define _OMAP2420_SYS_H_
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
/*
* 2420 specific Section
diff --git a/arch/arm/include/asm/arch-omap24xx/sizes.h b/arch/arm/include/asm/arch-omap24xx/sizes.h
deleted file mode 100644
index aaba18f..0000000
--- a/arch/arm/include/asm/arch-omap24xx/sizes.h
+++ /dev/null
@@ -1,49 +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
- */
-/* 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_32K 0x00008000
-#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_31M 0x01F00000
-#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 */
diff --git a/arch/arm/include/asm/sizes.h b/arch/arm/include/asm/sizes.h
index f8d92ca..b0b4f6a 100644
--- a/arch/arm/include/asm/sizes.h
+++ b/arch/arm/include/asm/sizes.h
@@ -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
diff --git a/include/configs/h2_p2_dbg_board.h b/include/configs/h2_p2_dbg_board.h
index e0d823f..a4dea7d 100644
--- a/include/configs/h2_p2_dbg_board.h
+++ b/include/configs/h2_p2_dbg_board.h
@@ -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
diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h
index 931560c..e6d9c7a 100644
--- a/include/configs/omap1510.h
+++ b/include/configs/omap1510.h
@@ -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 -->
diff --git a/include/configs/omap730.h b/include/configs/omap730.h
index 04d5144..c7682a1 100644
--- a/include/configs/omap730.h
+++ b/include/configs/omap730.h
@@ -31,7 +31,7 @@
#ifndef __INCLUDED_OMAP730_H
#define __INCLUDED_OMAP730_H
-#include <asm/arch/sizes.h>
+#include <asm/sizes.h>
/***************************************************************************
* OMAP730 Configuration Registers
--
1.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups
2010-09-24 21:31 [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups Andreas Bießmann
@ 2010-10-08 10:40 ` Andreas Bießmann
2010-10-08 10:46 ` Andreas Bießmann
2010-10-12 19:27 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2010-10-08 10:40 UTC (permalink / raw)
To: u-boot
Am 24.09.2010 23:31, schrieb Andreas Bie?mann:
> 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.
>
> Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
Any comment on that patch? Should I resend, is any action required from
my side?
regards
Andreas Bie?mann
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups
2010-09-24 21:31 [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups Andreas Bießmann
2010-10-08 10:40 ` Andreas Bießmann
@ 2010-10-08 10:46 ` Andreas Bießmann
2010-10-12 19:27 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2010-10-08 10:46 UTC (permalink / raw)
To: u-boot
Am 24.09.2010 23:31, schrieb Andreas Bie?mann:
> 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.
>
> Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
> ---
> 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
>
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups
2010-09-24 21:31 [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups Andreas Bießmann
2010-10-08 10:40 ` Andreas Bießmann
2010-10-08 10:46 ` Andreas Bießmann
@ 2010-10-12 19:27 ` Wolfgang Denk
2 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2010-10-12 19:27 UTC (permalink / raw)
To: u-boot
Dear =?UTF-8?q?Andreas=20Bie=C3=9Fmann?=,
In message <1285363903-71316-1-git-send-email-andreas.devel@googlemail.com> you wrote:
>
> 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.
>
> Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
> ---
> 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
Applied to u-boot-arm, thanks.
Best regards,
Wolfgang Denk
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-12 19:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-24 21:31 [U-Boot] [PATCH] arch/arm/include/asm/sizes.h: cleanups Andreas Bießmann
2010-10-08 10:40 ` Andreas Bießmann
2010-10-08 10:46 ` Andreas Bießmann
2010-10-12 19:27 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox