From 258060905e04fe2eb509756ef3b37e23e220a2d6 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 21 Apr 2014 18:39:35 +0900
Subject: [PATCH] sandbox: move source files from board/ to arch/sandbox/
Prior to commit 33a02da0, all boards must have board/${BOARD}/
or board/${VENDOR}/${BOARD}/ directory.
Now this rule is obsolete.
It looks weird that sandbox defines "vendor" and "board" just for
meeting the old U-Boot directory structure.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
---
arch/sandbox/lib/Makefile | 2 +-
{board/sandbox/sandbox => arch/sandbox/lib}/sandbox.c | 0
board/sandbox/sandbox/Makefile | 7 -------
boards.cfg | 2 +-
{board/sandbox/sandbox => doc}/README.sandbox | 0
5 files changed, 2 insertions(+), 9 deletions(-)
rename {board/sandbox/sandbox => arch/sandbox/lib}/sandbox.c (100%)
delete mode 100644 board/sandbox/sandbox/Makefile
rename {board/sandbox/sandbox => doc}/README.sandbox (100%)
diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 4c1a38d6bcb..6480ebfca67 100644
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -8,4 +8,4 @@
#
-obj-y += interrupts.o
+obj-y += interrupts.o sandbox.o
diff --git a/board/sandbox/sandbox/sandbox.c b/arch/sandbox/lib/sandbox.c
similarity index 100%
rename from board/sandbox/sandbox/sandbox.c
rename to arch/sandbox/lib/sandbox.c
diff --git a/board/sandbox/sandbox/Makefile b/board/sandbox/sandbox/Makefile
deleted file mode 100644
index a0b9880d6e3..00000000000
--- a/board/sandbox/sandbox/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Copyright (c) 2011 The Chromium OS Authors.
-#
-# SPDX-License-Identifier: GPL-2.0+
-#
-
-obj-y := sandbox.o
diff --git a/boards.cfg b/boards.cfg
index 983c657f544..8f5ee645968 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -1179,7 +1179,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 - sandbox sandbox sandbox - Simon Glass <sjg@chromium.org>
+Active sandbox sandbox - - <none> 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 - -
diff --git a/board/sandbox/sandbox/README.sandbox b/doc/README.sandbox
similarity index 100%
rename from board/sandbox/sandbox/README.sandbox
rename to doc/README.sandbox
--
GitLab