diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 4c1a38d6bcb7af7efb4e1e6fcb1631ec857f65ec..6480ebfca671608116647ec84188ff96897a6da5 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 a0b9880d6e3af2655a16b5cbffdfa92b1c8a0e19..0000000000000000000000000000000000000000
--- 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 983c657f54412cec9743bb92395d5ad0a2d031a2..8f5ee6459687716cde5bf174b8d6b8ef0a3daebd 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