Chromium Code Reviews| Index: Makefile |
| diff --git a/Makefile b/Makefile |
| index 0aa160f9886c777c4efcca0e993b141578f0c3b4..b1387d8d81f691fad1d61e0cb5aeb33534e3547f 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -117,47 +117,47 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' |
| CONFIG_INTERNAL ?= yes |
| # Always enable serprog for now. Needs to be disabled on Windows. |
| -CONFIG_SERPROG ?= yes |
| +CONFIG_SERPROG ?= no |
|
Stefan Reinauer
2011/03/25 16:57:47
I think this should go into the ebuild instead. On
Louis
2011/03/29 07:55:02
Oooooops. David has committed this in CL 6732047.
|
| # RayeR SPIPGM hardware support |
| -CONFIG_RAYER_SPI ?= yes |
| +CONFIG_RAYER_SPI ?= no |
| # Always enable 3Com NICs for now. |
| -CONFIG_NIC3COM ?= yes |
| +CONFIG_NIC3COM ?= no |
| # Enable NVIDIA graphics cards. Note: write and erase do not work properly. |
| -CONFIG_GFXNVIDIA ?= yes |
| +CONFIG_GFXNVIDIA ?= no |
| # Always enable SiI SATA controllers for now. |
| -CONFIG_SATASII ?= yes |
| +CONFIG_SATASII ?= no |
| # Highpoint (HPT) ATA/RAID controller support. |
| # IMPORTANT: This code is not yet working! |
| CONFIG_ATAHPT ?= no |
| # Always enable FT2232 SPI dongles for now. |
| -CONFIG_FT2232_SPI ?= yes |
| +CONFIG_FT2232_SPI ?= no |
| # Always enable dummy tracing for now. |
| CONFIG_DUMMY ?= yes |
| # Always enable Dr. Kaiser for now. |
| -CONFIG_DRKAISER ?= yes |
| +CONFIG_DRKAISER ?= no |
| # Always enable Realtek NICs for now. |
| -CONFIG_NICREALTEK ?= yes |
| +CONFIG_NICREALTEK ?= no |
| # Disable National Semiconductor NICs until support is complete and tested. |
| CONFIG_NICNATSEMI ?= no |
| # Always enable SPI on Intel NICs for now. |
| -CONFIG_NICINTEL_SPI ?= yes |
| +CONFIG_NICINTEL_SPI ?= no |
| # Always enable SPI on OGP cards for now. |
| -CONFIG_OGP_SPI ?= yes |
| +CONFIG_OGP_SPI ?= no |
| # Always enable Bus Pirate SPI for now. |
| -CONFIG_BUSPIRATE_SPI ?= yes |
| +CONFIG_BUSPIRATE_SPI ?= no |
| # Disable Dediprog SF100 until support is complete and tested. |
| CONFIG_DEDIPROG ?= no |
| @@ -188,7 +188,10 @@ ifeq ($(CONFIG_INTERNAL), yes) |
| FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' |
| PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o |
| # FIXME: The PROGRAMMER_OBJS below should only be included on x86. |
| +# FIXME: unify XXXspi.o and XXX_spi.o naming conventions. spi/XXX.o? |
| PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o mcp6x_spi.o |
| +# FIXME: The PROGRAMMER_OBJS below should only be included on ARM |
| +PROGRAMMER_OBJS += tegra2_spi.o |
| NEED_PCI := yes |
| endif |