diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2017-11-25 22:43:57 +0100 |
|---|---|---|
| committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2017-11-30 02:34:20 +0100 |
| commit | e23eb942ad103f6d3dd15d9346bb1ea132899963 (patch) | |
| tree | 610c26dfb21ba0504b77d16600227ac5b4124e77 | |
| parent | 5271dda05030982a94ced178fdc031e8f76da988 (diff) | |
ARM: rmobile: Stop using rcar-common/common.c on Gen3
Since the Gen3 clock driver now has a .remove callback, it is no
longer necessary to shut the clock down before booting Linux in the
arch_preboot_os hook. Stop using it and while doing so, remove all
the ad-hoc config options which this hook used.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| -rw-r--r-- | board/renesas/salvator-x/Makefile | 2 | ||||
| -rw-r--r-- | board/renesas/ulcb/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/salvator-x.h | 8 | ||||
| -rw-r--r-- | include/configs/ulcb.h | 8 |
4 files changed, 2 insertions, 18 deletions
diff --git a/board/renesas/salvator-x/Makefile b/board/renesas/salvator-x/Makefile index 61b0d063e59..5b4dea91c14 100644 --- a/board/renesas/salvator-x/Makefile +++ b/board/renesas/salvator-x/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := salvator-x.o ../rcar-common/common.o +obj-y := salvator-x.o diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile index 6fe0b480f77..406fdc8fa40 100644 --- a/board/renesas/ulcb/Makefile +++ b/board/renesas/ulcb/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := ulcb.o cpld.o ../rcar-common/common.o +obj-y := ulcb.o cpld.o diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 5004fa31b6d..605c9c64b82 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -62,12 +62,4 @@ #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 -/* Module stop status bits */ -/* MFIS, SCIF1 */ -#define CONFIG_SMSTP2_ENA 0x00002040 -/* SCIF2 */ -#define CONFIG_SMSTP3_ENA 0x00000400 -/* INTC-AP, IRQC */ -#define CONFIG_SMSTP4_ENA 0x00000180 - #endif /* __SALVATOR_X_H */ diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index 41ba5972a6e..8f989bbce5e 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -83,12 +83,4 @@ unsigned char ulcb_softspi_read(void); #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 -/* Module stop status bits */ -/* MFIS, SCIF1 */ -#define CONFIG_SMSTP2_ENA 0x00002040 -/* SCIF2 */ -#define CONFIG_SMSTP3_ENA 0x00000400 -/* INTC-AP, IRQC */ -#define CONFIG_SMSTP4_ENA 0x00000180 - #endif /* __ULCB_H */ |