brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

ARM: uniphier: remove sbc/ directory

Browse Source 
Now that this directory contains only uniphier_sbc_boot_is_swapped(),
move it to boot-device.c and delete the sbc/ directory entirely.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2020-07-09 15:08:20 +09:00
parent 862274913f
commit d7877c985b
5 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-uniphier/Makefile
View File

@ -27,7 +27,6 @@ obj-y += fdt-fixup.o
endif
obj-y += sbc/
obj-y += soc-info.o
obj-y += boot-device/
obj-y += clk/

9
arch/arm/mach-uniphier/boot-device/boot-device.c
View File

@ -14,11 +14,18 @@
#include <linux/log2.h>
#include "../init.h"
#include "../sbc/sbc-regs.h"
#include "../sg-regs.h"
#include "../soc-info.h"
#include "boot-device.h"
#define SBBASE0 0x58c00100
#define SBBASE_BANK_ENABLE BIT(0)
static int uniphier_sbc_boot_is_swapped(void)
{
return !(readl(SBBASE0) & SBBASE_BANK_ENABLE);
}
struct uniphier_boot_device_info {
unsigned int soc_id;
unsigned int boot_device_sel_shift;

3
arch/arm/mach-uniphier/sbc/Makefile
View File

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-y += sbc-boot.o

14
arch/arm/mach-uniphier/sbc/sbc-boot.c
View File

@ -1,14 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
//
// Copyright (C) 2011-2014 Panasonic Corporation
// Copyright (C) 2015-2019 Socionext Inc.
#include <linux/io.h>
#define SBBASE0 0x58c00100
#define SBBASE_BANK_ENABLE (0x00000001)
int uniphier_sbc_boot_is_swapped(void)
{
return !(readl(SBBASE0) & SBBASE_BANK_ENABLE);
}

14
arch/arm/mach-uniphier/sbc/sbc-regs.h
View File

@ -1,14 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* UniPhier SBC (System Bus Controller) registers
*
* Copyright (C) 2011-2014 Panasonic Corporation
* Copyright (C) 2015-2016 Socionext Inc.
*/
#ifndef ARCH_SBC_REGS_H
#define ARCH_SBC_REGS_H
int uniphier_sbc_boot_is_swapped(void);
#endif /* ARCH_SBC_REGS_H */