summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-05-14 12:54:37 +0900
committerSimon Glass <sjg@chromium.org>2014-05-16 11:40:51 -0700
commitc6eb9458e82cb47afa8f20e21a4cac5211eab557 (patch)
tree4224a387c3fb638fc373782dbe38f29c3e81ad33
parent2072e7262965bb48d7fffb1e283101e6ed8b21a8 (diff)
downloadu-boot-imx-c6eb9458e82cb47afa8f20e21a4cac5211eab557.zip
u-boot-imx-c6eb9458e82cb47afa8f20e21a4cac5211eab557.tar.gz
u-boot-imx-c6eb9458e82cb47afa8f20e21a4cac5211eab557.tar.bz2
Revert "sandbox: move source files from board/ to arch/sandbox/"
This reverts commit 258060905e04fe2eb509756ef3b37e23e220a2d6. Conflicts: boards.cfg Wrong patch 25806090 was applied by accident. Revert it. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/sandbox/lib/Makefile2
-rw-r--r--board/sandbox/sandbox/Makefile7
-rw-r--r--board/sandbox/sandbox/README.sandbox (renamed from doc/README.sandbox)0
-rw-r--r--board/sandbox/sandbox/sandbox.c (renamed from arch/sandbox/lib/sandbox.c)0
-rw-r--r--boards.cfg2
5 files changed, 9 insertions, 2 deletions
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 0000000..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
index 529c447..529c447 100644
--- a/doc/README.sandbox
+++ b/board/sandbox/sandbox/README.sandbox
diff --git a/arch/sandbox/lib/sandbox.c b/board/sandbox/sandbox/sandbox.c
index e4d4e02..e4d4e02 100644
--- a/arch/sandbox/lib/sandbox.c
+++ b/board/sandbox/sandbox/sandbox.c
diff --git a/boards.cfg b/boards.cfg
index 3a59686..b01672d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -1183,7 +1183,7 @@ Active powerpc ppc4xx - xilinx ppc405-generic
Active powerpc ppc4xx - xilinx ppc405-generic xilinx-ppc405-generic_flash xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <ricardo.ribalda@uam.es>
Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic xilinx-ppc440-generic:SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1 Ricardo Ribalda <ricardo.ribalda@uam.es>
Active powerpc ppc4xx - xilinx ppc440-generic xilinx-ppc440-generic_flash xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC Ricardo Ribalda <ricardo.ribalda@uam.es>
-Active sandbox sandbox - - <none> sandbox - Simon Glass <sjg@chromium.org>
+Active sandbox sandbox - sandbox sandbox sandbox - Simon Glass <sjg@chromium.org>
Active sh sh2 - renesas rsk7203 rsk7203 - Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>:Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Active sh sh2 - renesas rsk7264 rsk7264 - Phil Edworthy <phil.edworthy@renesas.com>
Active sh sh2 - renesas rsk7269 rsk7269 - -