soc/intel: Drop CID1 from GNVS

The only reference to CID1 is in common/acpi/wifi.asl and
only two braswell boards include it. Everywhere else
the value in GNVS was unused.

Change-Id: I09ea756fb3743e33d1e221f0a0df3a6fdc3fc3ba
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50297
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

src/soc/intel/cannonlake/acpi.c

@@ -18,7 +18,6 @@
 #include <soc/pm.h>
 #include <soc/systemagent.h>
 #include <string.h>
-#include <wrdd.h>
 
 #include "chip.h"
 
@@ -182,9 +181,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
 	/* Enable DPTF based on mainboard configuration */
 	gnvs->dpte = config->dptf_enable;
 
-	/* Fill in the Wifi Region id */
-	gnvs->cid1 = wifi_regulatory_domain();
-
 	/* Set USB2/USB3 wake enable bitmaps. */
 	gnvs->u2we = config->usb2_wake_enable_bitmap;
 	gnvs->u3we = config->usb3_wake_enable_bitmap;