Message ID | 1546521983-19385-5-git-send-email-amittomer25@gmail.com |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show |
Series | Actions S700 SoC support | expand |
On 03/01/2019 13:26, Amit Singh Tomar wrote: > Bubblegum board now gets driven from common owl framework, so > let's remove the respected board files. I think this patch could be split and merged into other patches, mostly 1/8. > Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com> > --- > board/ucRobotics/bubblegum_96/Kconfig | 15 -------- > board/ucRobotics/bubblegum_96/MAINTAINERS | 6 --- > board/ucRobotics/bubblegum_96/Makefile | 3 -- > board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 ---------------------------- > 4 files changed, 80 deletions(-) > delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig > delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS > delete mode 100644 board/ucRobotics/bubblegum_96/Makefile > delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c > > diff --git a/board/ucRobotics/bubblegum_96/Kconfig b/board/ucRobotics/bubblegum_96/Kconfig > deleted file mode 100644 > index 2dd40d9..0000000 > --- a/board/ucRobotics/bubblegum_96/Kconfig > +++ /dev/null That should be part of patch 1/8, where you remove the inclusion of that file. > @@ -1,15 +0,0 @@ > -if TARGET_BUBBLEGUM_96 > - > -config SYS_BOARD > - default "bubblegum_96" > - > -config SYS_VENDOR > - default "ucRobotics" > - > -config SYS_SOC > - default "s900" > - > -config SYS_CONFIG_NAME > - default "bubblegum_96" > - > -endif > diff --git a/board/ucRobotics/bubblegum_96/MAINTAINERS b/board/ucRobotics/bubblegum_96/MAINTAINERS > deleted file mode 100644 > index d0cb727..0000000 > --- a/board/ucRobotics/bubblegum_96/MAINTAINERS > +++ /dev/null Can you please adjust the paths in /MAINTAINERS? board/ucRobotics will be gone after this patch, that should be reflected there. This could be the only thing left in this patch or merged into 1/8. > @@ -1,6 +0,0 @@ > -BUBBLEGUM_96 BOARD > -M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > -S: Maintained > -F: board/ucRobotics/bubblegum_96/ > -F: include/configs/bubblegum_96.h > -F: configs/bubblegum_96_defconfig > diff --git a/board/ucRobotics/bubblegum_96/Makefile b/board/ucRobotics/bubblegum_96/Makefile > deleted file mode 100644 > index c4b524d..0000000 > --- a/board/ucRobotics/bubblegum_96/Makefile > +++ /dev/null > @@ -1,3 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > - > -obj-y := bubblegum_96.o > diff --git a/board/ucRobotics/bubblegum_96/bubblegum_96.c b/board/ucRobotics/bubblegum_96/bubblegum_96.c > deleted file mode 100644 > index a4c202d..0000000 > --- a/board/ucRobotics/bubblegum_96/bubblegum_96.c > +++ /dev/null That should be part of 1/8 as well, where you more or less rename that file here. That helps git to detect this and show this accordingly. Cheers, Andre. > @@ -1,56 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Bubblegum-96 Boards Support > - * > - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > - */ > - > -#include <linux/arm-smccc.h> > -#include <linux/psci.h> > -#include <common.h> > -#include <asm/io.h> > -#include <asm/mach-types.h> > -#include <asm/psci.h> > - > -DECLARE_GLOBAL_DATA_PTR; > - > -/* > - * dram_init - sets uboots idea of sdram size > - */ > -int dram_init(void) > -{ > - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; > - return 0; > -} > - > -/* This is called after dram_init() so use get_ram_size result */ > -int dram_init_banksize(void) > -{ > - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; > - gd->bd->bi_dram[0].size = gd->ram_size; > - > - return 0; > -} > - > -static void show_psci_version(void) > -{ > - struct arm_smccc_res res; > - > - arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); > - > - printf("PSCI: v%ld.%ld\n", > - PSCI_VERSION_MAJOR(res.a0), > - PSCI_VERSION_MINOR(res.a0)); > -} > - > -int board_init(void) > -{ > - show_psci_version(); > - > - return 0; > -} > - > -void reset_cpu(ulong addr) > -{ > - psci_system_reset(); > -} >
diff --git a/board/ucRobotics/bubblegum_96/Kconfig b/board/ucRobotics/bubblegum_96/Kconfig deleted file mode 100644 index 2dd40d9..0000000 --- a/board/ucRobotics/bubblegum_96/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -if TARGET_BUBBLEGUM_96 - -config SYS_BOARD - default "bubblegum_96" - -config SYS_VENDOR - default "ucRobotics" - -config SYS_SOC - default "s900" - -config SYS_CONFIG_NAME - default "bubblegum_96" - -endif diff --git a/board/ucRobotics/bubblegum_96/MAINTAINERS b/board/ucRobotics/bubblegum_96/MAINTAINERS deleted file mode 100644 index d0cb727..0000000 --- a/board/ucRobotics/bubblegum_96/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BUBBLEGUM_96 BOARD -M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> -S: Maintained -F: board/ucRobotics/bubblegum_96/ -F: include/configs/bubblegum_96.h -F: configs/bubblegum_96_defconfig diff --git a/board/ucRobotics/bubblegum_96/Makefile b/board/ucRobotics/bubblegum_96/Makefile deleted file mode 100644 index c4b524d..0000000 --- a/board/ucRobotics/bubblegum_96/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-y := bubblegum_96.o diff --git a/board/ucRobotics/bubblegum_96/bubblegum_96.c b/board/ucRobotics/bubblegum_96/bubblegum_96.c deleted file mode 100644 index a4c202d..0000000 --- a/board/ucRobotics/bubblegum_96/bubblegum_96.c +++ /dev/null @@ -1,56 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Bubblegum-96 Boards Support - * - * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - */ - -#include <linux/arm-smccc.h> -#include <linux/psci.h> -#include <common.h> -#include <asm/io.h> -#include <asm/mach-types.h> -#include <asm/psci.h> - -DECLARE_GLOBAL_DATA_PTR; - -/* - * dram_init - sets uboots idea of sdram size - */ -int dram_init(void) -{ - gd->ram_size = CONFIG_SYS_SDRAM_SIZE; - return 0; -} - -/* This is called after dram_init() so use get_ram_size result */ -int dram_init_banksize(void) -{ - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; - gd->bd->bi_dram[0].size = gd->ram_size; - - return 0; -} - -static void show_psci_version(void) -{ - struct arm_smccc_res res; - - arm_smccc_smc(ARM_PSCI_0_2_FN_PSCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &res); - - printf("PSCI: v%ld.%ld\n", - PSCI_VERSION_MAJOR(res.a0), - PSCI_VERSION_MINOR(res.a0)); -} - -int board_init(void) -{ - show_psci_version(); - - return 0; -} - -void reset_cpu(ulong addr) -{ - psci_system_reset(); -}
Bubblegum board now gets driven from common owl framework, so let's remove the respected board files. Signed-off-by: Amit Singh Tomar <amittomer25@gmail.com> --- board/ucRobotics/bubblegum_96/Kconfig | 15 -------- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 --- board/ucRobotics/bubblegum_96/Makefile | 3 -- board/ucRobotics/bubblegum_96/bubblegum_96.c | 56 ---------------------------- 4 files changed, 80 deletions(-) delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c