From f78f97e156f3ec71c9ec62cac4cf8954728cddf8 Mon Sep 17 00:00:00 2001 From: Tristan Shieh Date: Fri, 15 Jun 2018 15:00:15 +0800 Subject: mediatek/mt8183: Remove the stub flash driver that planned to use eMMC The stub flash driver is a temporary hack that planned to adapt eMMC to SPI flash. Remove the hack since SPI flash is what we really expect. BUG=b:80501386 BRANCH=none TEST=Boots fine on Kukui Change-Id: If29869461fc8c2efe26bb8c901737ee85935d27f Signed-off-by: Tristan Shieh Reviewed-on: https://review.coreboot.org/27114 Tested-by: build bot (Jenkins) Reviewed-by: Paul Kocialkowski Reviewed-by: Hung-Te Lin --- src/soc/mediatek/mt8183/Makefile.inc | 4 -- src/soc/mediatek/mt8183/flash_controller.c | 59 ------------------------------ src/soc/mediatek/mt8183/spi.c | 1 - 3 files changed, 64 deletions(-) delete mode 100644 src/soc/mediatek/mt8183/flash_controller.c diff --git a/src/soc/mediatek/mt8183/Makefile.inc b/src/soc/mediatek/mt8183/Makefile.inc index 954ab216c3..01d65171ca 100644 --- a/src/soc/mediatek/mt8183/Makefile.inc +++ b/src/soc/mediatek/mt8183/Makefile.inc @@ -1,7 +1,6 @@ ifeq ($(CONFIG_SOC_MEDIATEK_MT8183),y) bootblock-y += bootblock.c -bootblock-$(CONFIG_SPI_FLASH) += flash_controller.c bootblock-$(CONFIG_SPI_FLASH) += spi.c bootblock-y += ../common/timer.c ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) @@ -9,20 +8,17 @@ bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c endif bootblock-y += ../common/wdt.c -verstage-$(CONFIG_SPI_FLASH) += flash_controller.c verstage-$(CONFIG_SPI_FLASH) += spi.c verstage-y += ../common/timer.c verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c verstage-y += ../common/wdt.c -romstage-$(CONFIG_SPI_FLASH) += flash_controller.c romstage-$(CONFIG_SPI_FLASH) += spi.c romstage-y += ../common/timer.c romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c romstage-y += ../common/wdt.c ramstage-y += ../common/cbmem.c emi.c -ramstage-$(CONFIG_SPI_FLASH) += flash_controller.c ramstage-$(CONFIG_SPI_FLASH) += spi.c ramstage-y += ../common/timer.c ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c diff --git a/src/soc/mediatek/mt8183/flash_controller.c b/src/soc/mediatek/mt8183/flash_controller.c deleted file mode 100644 index a6a816ffde..0000000000 --- a/src/soc/mediatek/mt8183/flash_controller.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2018 MediaTek Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/* this is a spi driver which adapts emmc to fake spi flash */ - -#include -#include - -static void init_io(void) -{ -} - -static int emmc_adapter_read(const struct spi_flash *flash, u32 addr, - size_t len, void *buf) -{ - return 0; -} - -static int emmc_adapter_write(const struct spi_flash *flash, u32 addr, - size_t len, const void *buf) -{ - return 0; -} - -static int emmc_adapter_erase(const struct spi_flash *flash, u32 offset, - size_t len) -{ - return 0; -} - -const struct spi_flash_ops spi_emmc_flash_ops = { - .read = emmc_adapter_read, - .write = emmc_adapter_write, - .erase = emmc_adapter_erase, -}; - -int mtk_spi_flash_probe(const struct spi_slave *spi, struct spi_flash *flash) -{ - init_io(); - - flash->name = "spi emmc flash controller"; - flash->sector_size = 0x800; - flash->size = CONFIG_ROM_SIZE; - - flash->ops = &spi_emmc_flash_ops; - return 0; -} diff --git a/src/soc/mediatek/mt8183/spi.c b/src/soc/mediatek/mt8183/spi.c index 78821d10fa..d85138cfb0 100644 --- a/src/soc/mediatek/mt8183/spi.c +++ b/src/soc/mediatek/mt8183/spi.c @@ -18,7 +18,6 @@ static const struct spi_ctrlr spi_flash_ctrlr = { .max_xfer_size = 65535, - .flash_probe = mtk_spi_flash_probe, }; const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = { -- cgit v1.2.3