  
 -	bool retval = spi_transfer(a1->spi_ctx, a1->spi_tx, a1->spi_rx, tx_len);
 +	assert(spi_transfer(a1->spi_ctx, a1->spi_tx, a1->spi_rx, tx_len));
->>>>>>> Stashed changes
  	hexdump("send: TX", a1->spi_tx, tx_len);
  	hexdump("send: RX", a1->spi_rx, tx_len);
  
  	int poll_len = tx_len + 4 * a1->num_chips;
-<<<<<<< Updated upstream
--	assert(spi_transfer(a1->spi_ctx, NULL, a1->spi_rx + tx_len, poll_len));
-+	retval = spi_transfer(a1->spi_ctx, NULL, a1->spi_rx + tx_len, poll_len);
-=======
 -	retval = spi_transfer(a1->spi_ctx, NULL, a1->spi_rx + tx_len, poll_len);
 +	assert(spi_transfer(a1->spi_ctx, NULL, a1->spi_rx + tx_len, poll_len));
->>>>>>> Stashed changes
  	hexdump("poll: RX", a1->spi_rx + tx_len, poll_len);
  
  	uint8_t *scan = a1->spi_rx;
  	int i;
  	for (i = 0; i < poll_len; i += 2) {
-<<<<<<< Updated upstream
--		if ((scan[i] & 0x0f) == A1_READ_RESULT)
-+		if ((scan[i] & 0x0f) == A1_READ_RESULT) {
- 			return scan + i;
-+		}
- 	}
--	applog(LOG_ERR, "%d: cmd_READ_RESULT_BCAST failed", a1->chain_id);
-+	applog(LOG_ERR, "%d: cmd_READ_RESULT_BCAST failed", a1->board_id);
- 	return NULL;
- }
- 
-@@ -224,7 +302,7 @@ static uint8_t *cmd_WRITE_REG(struct A1_chain *a1, uint8_t chip, uint8_t *reg)
- {
- 	uint8_t *ret = exec_cmd(a1, A1_WRITE_REG, chip, reg, 6, 0);
- 	if (ret == NULL || ret[0] != A1_WRITE_REG) {
--		applog(LOG_ERR, "%d: cmd_WRITE_REG failed", a1->chain_id);
-+		applog(LOG_ERR, "%d: cmd_WRITE_REG failed", a1->board_id);
- 		return NULL;
- 	}
- 	return ret;
-@@ -235,7 +313,7 @@ static uint8_t *cmd_READ_REG(struct A1_chain *a1, uint8_t chip)
- 	uint8_t *ret = exec_cmd(a1, A1_READ_REG, chip, NULL, 0, 6);
- 	if (ret == NULL || ret[0] != A1_READ_REG_RESP || ret[1] != chip) {
- 		applog(LOG_ERR, "%d: cmd_READ_REG chip %d failed",
--		       a1->chain_id, chip);
-+		       a1->board_id, chip);
- 		return NULL;
- 	}
- 	memcpy(a1->spi_rx, ret, 8);
-@@ -245,18 +323,20 @@ static uint8_t *cmd_READ_REG(struct A1_chain *a1, uint8_t chip)
- static uint8_t *cmd_WRITE_JOB(struct A1_chain *a1, uint8_t chip_id,
- 			      uint8_t *job)
- {
-+
-+	uint8_t cmd = (a1->spi_tx[0] << 8) | a1->spi_tx[1];
-=======
 -		if ((scan[i] & 0x0f) == A1_READ_RESULT) {
 +		if ((scan[i] & 0x0f) == A1_READ_RESULT)
  			return scan + i;

+cgminer_SOURCES += A1-board-selector.h
+cgminer_SOURCES += A1-board-selector-CCD.c A1-board-selector-CCR.c
+cgminer_SOURCES += A1-trimpot-mcp4x.h A1-trimpot-mcp4x.c
>>>>>>> Stashed changes
 endif
 
 if HAS_DRILLBIT
diff --git a/NEWS b/NEWS
<<<<<<< Updated upstream
index 43b63e2..eec6a3d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,45 +1,3 @@
-Version 4.3.3 - 3rd May 2014
-
-- Fix typo
-- Work should be freed when aged, fixing a massive memory leak for bxf devices
-- miner.php fix single rig summary/config field formatting
-- miner.php fix single rig total formatting
-
-
-Version 4.3.2 - 2nd May 2014
-
-- Fix accounting bug with nrolltime drivers
-
-
-Version 4.3.1 - 2nd May 2014
-
-- upgrade some int to int64_t to avoid overflows in reporting
-- Make reconnection messages more explanatory
-- Stratum client.reconnect require matching URL
-- Fix memory leak in submit_noffset_nonce
-- Clean up any work that may not have been used in the work scheduler
-- Avoid unnecessary deref now that it's done within discard_work
-- Clean work pointers after one way usage functions
-- Avoid unnecessary total_work_inc in generating local work
-- Cosmetic fixes
-- Fix idle bug, when redirected client can't auth
-- Rename spond temp rate to asics total rate
-- Build fixes
-- Set the unique id only for usb devices with serial strings longer than 4 chars
-long
-- Use usb serial strings as unique id if devices have them
-- Discretely identify the onestring miners as OSM
-- Add bxf debugging option and osm led modes
-- A1: modularize board selector / add initial CCR support
-- A1: cleanup tca9535 logging
-- A1: fix and extend PLL parameters
-- A1: clean up compile warnings
-- A1: use real level in hexdump
-- Add identification for onestring miner variants
-- Avalon2: Parser the power good signal
-- driver-avalon2: this functions used on detect, which don't have thr setup yet
-
-
=======
index eec6a3d..43b63e2 100644
--- a/NEWS
+++ b/NEWS

-
-#include "miner.h"
-
-struct tca9535_ctx {
-	uint8_t addr;
-	uint8_t board_mask;
