Re: [U-Boot] [PATCH] Revert sandbox: move source files from board/ to arch/sandbox/

[Simon Glass]

On 13 May 2014 21:54, Masahiro Yamada yamad...@jp.panasonic.com wrote:
 This reverts commit 258060905e04fe2eb509756ef3b37e23e220a2d6.

 Conflicts:
 boards.cfg

 Wrong patch 25806090 was applied by accident. Revert it.

 Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
 Cc: Simon Glass s...@chromium.org

Acked-by: Simon Glass s...@chromium.org

Thanks. I found your original patch also - it was in Tom's queue.

If Tom doesn't do it earlier, I'll pick this up next week.

Regards,
Simon
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH] Revert sandbox: move source files from board/ to arch/sandbox/

[Masahiro Yamada]

This reverts commit 258060905e04fe2eb509756ef3b37e23e220a2d6.

Conflicts:
boards.cfg

Wrong patch 25806090 was applied by accident. Revert it.

Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com
Cc: Simon Glass s...@chromium.org
---
 arch/sandbox/lib/Makefile | 2 +-
 board/sandbox/sandbox/Makefile| 7 +++
 {doc = board/sandbox/sandbox}/README.sandbox | 0
 {arch/sandbox/lib = board/sandbox/sandbox}/sandbox.c | 0
 boards.cfg| 2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 board/sandbox/sandbox/Makefile
 rename {doc = board/sandbox/sandbox}/README.sandbox (100%)
 rename {arch/sandbox/lib = board/sandbox/sandbox}/sandbox.c (100%)

diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 6480ebf..4c1a38d 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -8,4 +8,4 @@
 #
 
 
-obj-y  += interrupts.o sandbox.o
+obj-y  += interrupts.o
diff --git a/board/sandbox/sandbox/Makefile b/board/sandbox/sandbox/Makefile
new file mode 100644
index 000..a0b9880
--- /dev/null
+++ b/board/sandbox/sandbox/Makefile
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2011 The Chromium OS Authors.
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-y  := sandbox.o
diff --git a/doc/README.sandbox b/board/sandbox/sandbox/README.sandbox
similarity index 100%
rename from doc/README.sandbox
rename to board/sandbox/sandbox/README.sandbox
diff --git a/arch/sandbox/lib/sandbox.c b/board/sandbox/sandbox/sandbox.c
similarity index 100%
rename from arch/sandbox/lib/sandbox.c
rename to board/sandbox/sandbox/sandbox.c
diff --git a/boards.cfg b/boards.cfg
index 9d90550..6aea684 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -1182,7 +1182,7 @@ Active  powerpc ppc4xx -   xilinx 
 ppc405-generic
 Active  powerpc ppc4xx -   xilinx  ppc405-generic  
xilinx-ppc405-generic_flash   
xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC  
  Ricardo Ribalda 
ricardo.riba...@uam.es
 Active  powerpc ppc4xx -   xilinx  ppc440-generic  
xilinx-ppc440-generic 
xilinx-ppc440-generic:SYS_TEXT_BASE=0x0400,RESET_VECTOR_ADDRESS=0x0410,BOOT_FROM_XMD=1
Ricardo Ribalda ricardo.riba...@uam.es
 Active  powerpc ppc4xx -   xilinx  ppc440-generic  
xilinx-ppc440-generic_flash   
xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F6,RESET_VECTOR_ADDRESS=0xF7FC  
  Ricardo Ribalda 
ricardo.riba...@uam.es
-Active  sandbox sandbox-   -   none  
sandbox   - 

Simon Glass s...@chromium.org
+Active  sandbox sandbox-   sandbox sandbox 
sandbox   - 

Simon Glass s...@chromium.org
 Active  sh  sh2-   renesas rsk7203 
rsk7203   - 

Nobuhiro Iwamatsu iwamatsu.nobuh...@renesas.com:Nobuhiro Iwamatsu 
iwama...@nigauri.org
 Active  sh  sh2-   renesas rsk7264 
rsk7264   - 

Phil Edworthy phil.edwor...@renesas.com
 Active  sh  sh2-   renesas rsk7269 
rsk7269   - 

-
-- 
1.8.3.2

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot