1 files changed, 40 insertions, 40 deletions

diff --git a/src/t124/nvbctlib_t124.c b/src/t124/nvbctlib_t124.c
index ce0a34b..577a909 100644
--- a/src/t124/nvbctlib_t124.c
+++ b/src/t124/nvbctlib_t124.c
@@ -60,22 +60,22 @@ case token_bl_##x:\
 case token_##id:\
 	if (bct == NULL) \
 		return -ENODATA; \
-	*((u_int32_t *)data) = bct_ptr->id; \
+	*((uint32_t *)data) = bct_ptr->id; \
 	break
 
 #define CASE_GET_CONST(id, val) \
 case token_##id:\
-	*((u_int32_t *)data) = val; \
+	*((uint32_t *)data) = val; \
 	break
 
 #define CASE_GET_CONST_PREFIX(id, val_prefix) \
 case token_##id:\
-	*((u_int32_t *)data) = val_prefix##_##id; \
+	*((uint32_t *)data) = val_prefix##_##id; \
 	break
 
 #define CASE_SET_NVU32(id) \
 case token_##id:\
-	bct_ptr->id = *((u_int32_t *)data); \
+	bct_ptr->id = *((uint32_t *)data); \
 	break
 
 #define CASE_GET_DATA(id, size) \
@@ -121,9 +121,9 @@ parse_token t124_root_token_list[] = {
 
 int
 t124_set_dev_param(build_image_context *context,
-	u_int32_t index,
+	uint32_t index,
 	parse_token token,
-	u_int32_t value)
+	uint32_t value)
 {
 	nvboot_config_table *bct = NULL;
 
@@ -157,9 +157,9 @@ t124_set_dev_param(build_image_context *context,
 
 int
 t124_get_dev_param(build_image_context *context,
-	u_int32_t index,
+	uint32_t index,
 	parse_token token,
-	u_int32_t *value)
+	uint32_t *value)
 {
 	nvboot_config_table *bct = NULL;
 
@@ -191,9 +191,9 @@ t124_get_dev_param(build_image_context *context,
 
 int
 t124_get_sdram_param(build_image_context *context,
-		u_int32_t index,
+		uint32_t index,
 		parse_token token,
-		u_int32_t *value)
+		uint32_t *value)
 {
 	nvboot_sdram_params *params;
 	nvboot_config_table *bct = NULL;
@@ -521,9 +521,9 @@ t124_get_sdram_param(build_image_context *context,
 
 int
 t124_set_sdram_param(build_image_context *context,
-		u_int32_t index,
+		uint32_t index,
 		parse_token token,
-		u_int32_t value)
+		uint32_t value)
 {
 	nvboot_sdram_params *params;
 	nvboot_config_table *bct = NULL;
@@ -852,10 +852,10 @@ t124_set_sdram_param(build_image_context *context,
 }
 
 int
-t124_getbl_param(u_int32_t set,
+t124_getbl_param(uint32_t set,
 		parse_token id,
-		u_int32_t *data,
-		u_int8_t *bct)
+		uint32_t *data,
+		uint8_t *bct)
 {
 	nvboot_config_table *bct_ptr = (nvboot_config_table *)bct;
 
@@ -880,8 +880,8 @@ t124_getbl_param(u_int32_t set,
 		break;
 
 	case token_rsa_pss_sig_bl:
-		reverse_byte_order((u_int8_t *)data,
-			(const u_int8_t *)&bct_ptr->bootloader[set].signature.rsa_pss_sig,
+		reverse_byte_order((uint8_t *)data,
+			(const uint8_t *)&bct_ptr->bootloader[set].signature.rsa_pss_sig,
 			sizeof(nvboot_rsa_pss_sig));
 		break;
 
@@ -893,10 +893,10 @@ t124_getbl_param(u_int32_t set,
 }
 
 int
-t124_setbl_param(u_int32_t set,
+t124_setbl_param(uint32_t set,
 		parse_token id,
-		u_int32_t *data,
-		u_int8_t *bct)
+		uint32_t *data,
+		uint8_t *bct)
 {
 	nvboot_config_table *bct_ptr = (nvboot_config_table *)bct;
 
@@ -928,7 +928,7 @@ t124_setbl_param(u_int32_t set,
 }
 
 int
-t124_bct_get_value(parse_token id, void *data, u_int8_t *bct)
+t124_bct_get_value(parse_token id, void *data, uint8_t *bct)
 {
 	nvboot_config_table *bct_ptr = (nvboot_config_table *)bct;
 	nvboot_config_table  samplebct; /* Used for computing offsets. */
@@ -957,13 +957,13 @@ t124_bct_get_value(parse_token id, void *data, u_int8_t *bct)
 	case token_block_size:
 		if (bct == NULL)
 			return -ENODATA;
-		*((u_int32_t *)data) = 1 << bct_ptr->block_size_log2;
+		*((uint32_t *)data) = 1 << bct_ptr->block_size_log2;
 		break;
 
 	case token_page_size:
 		if (bct == NULL)
 			return -ENODATA;
-		*((u_int32_t *)data) = 1 << bct_ptr->page_size_log2;
+		*((uint32_t *)data) = 1 << bct_ptr->page_size_log2;
 		break;
 
 	/*
@@ -984,37 +984,37 @@ t124_bct_get_value(parse_token id, void *data, u_int8_t *bct)
 		break;
 
 	case token_rsa_key_modulus:
-		reverse_byte_order(data, (const u_int8_t *)&bct_ptr->key,
+		reverse_byte_order(data, (const uint8_t *)&bct_ptr->key,
 				sizeof(nvboot_rsa_key_modulus));
 		break;
 
 	case token_rsa_pss_sig_bct:
 		reverse_byte_order(data,
-			(const u_int8_t *)&bct_ptr->signature.rsa_pss_sig,
+			(const uint8_t *)&bct_ptr->signature.rsa_pss_sig,
 			sizeof(nvboot_rsa_pss_sig));
 		break;
 
 	case token_reserved_offset:
-		*((u_int32_t *)data) = (u_int8_t *)&(samplebct.reserved)
-				- (u_int8_t *)&samplebct;
+		*((uint32_t *)data) = (uint8_t *)&(samplebct.reserved)
+				- (uint8_t *)&samplebct;
 		break;
 
 	case token_bct_size:
-		*((u_int32_t *)data) = sizeof(nvboot_config_table);
+		*((uint32_t *)data) = sizeof(nvboot_config_table);
 		break;
 
 	CASE_GET_CONST(hash_size, sizeof(nvboot_hash));
 
 	case token_crypto_offset:
 		/* Offset to region in BCT to encrypt & sign */
-		*((u_int32_t *)data) = (u_int8_t *)&(samplebct.random_aes_blk)
-				- (u_int8_t *)&samplebct;
+		*((uint32_t *)data) = (uint8_t *)&(samplebct.random_aes_blk)
+				- (uint8_t *)&samplebct;
 		break;
 
 	case token_crypto_length:
 		/* size of region in BCT to encrypt & sign */
-		*((u_int32_t *)data) = (u_int8_t *)bct_ptr + sizeof(nvboot_config_table)
-				- (u_int8_t *)&(bct_ptr->random_aes_blk);
+		*((uint32_t *)data) = (uint8_t *)bct_ptr + sizeof(nvboot_config_table)
+				- (uint8_t *)&(bct_ptr->random_aes_blk);
 		break;
 
 	CASE_GET_CONST(max_bct_search_blks, NVBOOT_MAX_BCT_SEARCH_BLOCKS);
@@ -1062,7 +1062,7 @@ t124_bct_get_value_size(parse_token id)
 }
 
 int
-t124_bct_set_value(parse_token id, void *data, u_int8_t *bct)
+t124_bct_set_value(parse_token id, void *data, uint8_t *bct)
 {
 	nvboot_config_table *bct_ptr = (nvboot_config_table *)bct;
 
@@ -1087,7 +1087,7 @@ t124_bct_set_value(parse_token id, void *data, u_int8_t *bct)
 		break;
 
 	case token_rsa_key_modulus:
-		reverse_byte_order((u_int8_t *)&bct_ptr->key, data,
+		reverse_byte_order((uint8_t *)&bct_ptr->key, data,
 					sizeof(nvboot_rsa_key_modulus));
 		break;
 
@@ -1097,12 +1097,12 @@ t124_bct_set_value(parse_token id, void *data, u_int8_t *bct)
 		 * of bootloader being built in.
 		 */
 		reverse_byte_order(
-			(u_int8_t *)&bct_ptr->bootloader[0].signature.rsa_pss_sig,
+			(uint8_t *)&bct_ptr->bootloader[0].signature.rsa_pss_sig,
 			data, sizeof(nvboot_rsa_pss_sig));
 		break;
 
 	case token_rsa_pss_sig_bct:
-		reverse_byte_order((u_int8_t *)&bct_ptr->signature.rsa_pss_sig,
+		reverse_byte_order((uint8_t *)&bct_ptr->signature.rsa_pss_sig,
 			data, sizeof(nvboot_rsa_pss_sig));
 		break;
 
@@ -1115,9 +1115,9 @@ t124_bct_set_value(parse_token id, void *data, u_int8_t *bct)
 
 int
 t124_bct_set_data(parse_token id,
-	u_int8_t *data,
-	u_int32_t length,
-	u_int8_t *bct)
+	uint8_t *data,
+	uint32_t length,
+	uint8_t *bct)
 {
 	nvboot_config_table *bct_ptr = (nvboot_config_table *)bct;
 
@@ -1157,7 +1157,7 @@ int t124_bct_token_supported(parse_token token)
 
 void t124_init_bad_block_table(build_image_context *context)
 {
-	u_int32_t bytes_per_entry;
+	uint32_t bytes_per_entry;
 	nvboot_badblock_table *table;
 	nvboot_config_table *bct;